X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fpython.c;h=eed0591d395aed66ba373d3b02b208e65912adf3;hb=9589c94b03e65c8eb66c6b8b27f7455c558e604d;hp=8772cd1fc23623d52f8ab8d96042ee86b18bc2bb;hpb=c15dbfc3739f7c3bbd8171797eaef55749008bfa;p=collectd.git

diff --git a/src/python.c b/src/python.c
index 8772cd1f..eed0591d 100644
--- a/src/python.c
+++ b/src/python.c
@@ -435,8 +435,8 @@ static int cpy_write_callback(const data_set_t *ds, const value_list_t *value_li
 		sstrncpy(v->data.type_instance, value_list->type_instance, sizeof(v->data.type_instance));
 		sstrncpy(v->data.plugin, value_list->plugin, sizeof(v->data.plugin));
 		sstrncpy(v->data.plugin_instance, value_list->plugin_instance, sizeof(v->data.plugin_instance));
-		v->data.time = value_list->time;
-		v->interval = value_list->interval;
+		v->data.time = CDTIME_T_TO_DOUBLE(value_list->time);
+		v->interval = CDTIME_T_TO_DOUBLE(value_list->interval);
 		Py_CLEAR(v->values);
 		v->values = list;
 		Py_CLEAR(v->meta);
@@ -465,7 +465,7 @@ static int cpy_notification_callback(const notification_t *notification, user_da
 		sstrncpy(n->data.type_instance, notification->type_instance, sizeof(n->data.type_instance));
 		sstrncpy(n->data.plugin, notification->plugin, sizeof(n->data.plugin));
 		sstrncpy(n->data.plugin_instance, notification->plugin_instance, sizeof(n->data.plugin_instance));
-		n->data.time = notification->time;
+		n->data.time = CDTIME_T_TO_DOUBLE(notification->time);
 		sstrncpy(n->message, notification->message, sizeof(n->message));
 		n->severity = notification->severity;
 		ret = PyObject_CallFunctionObjArgs(c->callback, n, c->data, (void *) 0); /* New reference. */
@@ -978,6 +978,7 @@ PyMODINIT_FUNC PyInit_collectd(void) {
 
 static int cpy_config(oconfig_item_t *ci) {
 	int i;
+	char *argv = "";
 	PyObject *sys, *tb;
 	PyObject *sys_path;
 	PyObject *module;
@@ -1017,6 +1018,9 @@ static int cpy_config(oconfig_item_t *ci) {
 		cpy_log_exception("python initialization");
 		return 1;
 	}
+	PySys_SetArgv(1, &argv);
+	PyList_SetSlice(sys_path, 0, 1, NULL);
+
 #ifdef IS_PY3K
 	module = PyImport_ImportModule("collectd");
 #else