X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fpython.c;h=d5c2d461576730cab20c7508bf87a8a185774ded;hb=77460335ec305aa4fbd8218c6e5c1c849fbef9c0;hp=00516fb24180c40a99b1cb924c4fb4a7291631f2;hpb=96382507c3296a35399f6b3c258ae2a47761bf06;p=collectd.git

diff --git a/src/python.c b/src/python.c
index 00516fb2..d5c2d461 100644
--- a/src/python.c
+++ b/src/python.c
@@ -335,7 +335,7 @@ static int cpy_read_callback(user_data_t *data) {
 static int cpy_write_callback(const data_set_t *ds, const value_list_t *value_list, user_data_t *data) {
 	int i;
 	cpy_callback_t *c = data->data;
-	PyObject *ret, *list, *temp, *dict = NULL;
+	PyObject *ret, *list, *temp, *dict = NULL, *val;
 	Values *v;
 
 	CPY_LOCK_THREADS
@@ -345,32 +345,33 @@ static int cpy_write_callback(const data_set_t *ds, const value_list_t *value_li
 			CPY_RETURN_FROM_THREADS 0;
 		}
 		for (i = 0; i < value_list->values_len; ++i) {
-			if (ds->ds->type == DS_TYPE_COUNTER) {
+			if (ds->ds[i].type == DS_TYPE_COUNTER) {
 				if ((long) value_list->values[i].counter == value_list->values[i].counter)
 					PyList_SetItem(list, i, PyInt_FromLong(value_list->values[i].counter));
 				else
 					PyList_SetItem(list, i, PyLong_FromUnsignedLongLong(value_list->values[i].counter));
-			} else if (ds->ds->type == DS_TYPE_GAUGE) {
+			} else if (ds->ds[i].type == DS_TYPE_GAUGE) {
 				PyList_SetItem(list, i, PyFloat_FromDouble(value_list->values[i].gauge));
-			} else if (ds->ds->type == DS_TYPE_DERIVE) {
+			} else if (ds->ds[i].type == DS_TYPE_DERIVE) {
 				if ((long) value_list->values[i].derive == value_list->values[i].derive)
 					PyList_SetItem(list, i, PyInt_FromLong(value_list->values[i].derive));
 				else
 					PyList_SetItem(list, i, PyLong_FromLongLong(value_list->values[i].derive));
-			} else if (ds->ds->type == DS_TYPE_ABSOLUTE) {
+			} else if (ds->ds[i].type == DS_TYPE_ABSOLUTE) {
 				if ((long) value_list->values[i].absolute == value_list->values[i].absolute)
 					PyList_SetItem(list, i, PyInt_FromLong(value_list->values[i].absolute));
 				else
 					PyList_SetItem(list, i, PyLong_FromUnsignedLongLong(value_list->values[i].absolute));
 			} else {
 				Py_BEGIN_ALLOW_THREADS
-				ERROR("cpy_write_callback: Unknown value type %d.", ds->ds->type);
+				ERROR("cpy_write_callback: Unknown value type %d.", ds->ds[i].type);
 				Py_END_ALLOW_THREADS
 				Py_DECREF(list);
 				CPY_RETURN_FROM_THREADS 0;
 			}
 			if (PyErr_Occurred() != NULL) {
 				cpy_log_exception("value building for write callback");
+				Py_DECREF(list);
 				CPY_RETURN_FROM_THREADS 0;
 			}
 		}
@@ -427,7 +428,8 @@ static int cpy_write_callback(const data_set_t *ds, const value_list_t *value_li
 			}
 			free(table);
 		}
-		v = PyObject_New(Values, (void *) &ValuesType);
+		val = Values_New(); /* New reference. */
+		v = (Values *) val; 
 		sstrncpy(v->data.host, value_list->host, sizeof(v->data.host));
 		sstrncpy(v->data.type, value_list->type, sizeof(v->data.type));
 		sstrncpy(v->data.type_instance, value_list->type_instance, sizeof(v->data.type_instance));
@@ -435,9 +437,12 @@ static int cpy_write_callback(const data_set_t *ds, const value_list_t *value_li
 		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;
+		Py_CLEAR(v->values);
 		v->values = list;
+		Py_CLEAR(v->meta);
 		v->meta = dict;
 		ret = PyObject_CallFunctionObjArgs(c->callback, v, c->data, (void *) 0); /* New reference. */
+		Py_XDECREF(val);
 		if (ret == NULL) {
 			cpy_log_exception("write callback");
 		} else {
@@ -449,11 +454,12 @@ static int cpy_write_callback(const data_set_t *ds, const value_list_t *value_li
 
 static int cpy_notification_callback(const notification_t *notification, user_data_t *data) {
 	cpy_callback_t *c = data->data;
-	PyObject *ret;
+	PyObject *ret, *notify;
 	Notification *n;
 
 	CPY_LOCK_THREADS
-		n = PyObject_New(Notification, (void *) &NotificationType);
+		notify = Notification_New(); /* New reference. */
+		n = (Notification *) notify;
 		sstrncpy(n->data.host, notification->host, sizeof(n->data.host));
 		sstrncpy(n->data.type, notification->type, sizeof(n->data.type));
 		sstrncpy(n->data.type_instance, notification->type_instance, sizeof(n->data.type_instance));
@@ -463,6 +469,7 @@ static int cpy_notification_callback(const notification_t *notification, user_da
 		sstrncpy(n->message, notification->message, sizeof(n->message));
 		n->severity = notification->severity;
 		ret = PyObject_CallFunctionObjArgs(c->callback, n, c->data, (void *) 0); /* New reference. */
+		Py_XDECREF(notify);
 		if (ret == NULL) {
 			cpy_log_exception("notification callback");
 		} else {
@@ -896,6 +903,11 @@ static int cpy_init(void) {
 	static pthread_t thread;
 	sigset_t sigset;
 	
+	if (!Py_IsInitialized()) {
+		WARNING("python: Plugin loaded but not configured.");
+		plugin_unregister_shutdown("python");
+		return 0;
+	}
 	PyEval_InitThreads();
 	/* Now it's finally OK to use python threads. */
 	for (c = cpy_init_callbacks; c; c = c->next) {
@@ -966,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;
@@ -1005,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