3535
3636#include "cpython.h"
3737
38+ #ifndef PLUGIN_NAME
39+ #define PLUGIN_NAME "python"
40+ #endif
41+
3842typedef struct cpy_callback_s {
3943 char * name ;
4044 PyObject * callback ;
@@ -816,7 +820,7 @@ static PyObject *cpy_register_read(PyObject *self, PyObject *args,
816820 c -> next = NULL ;
817821
818822 plugin_register_complex_read (
819- /* group = */ "python" , buf , cpy_read_callback ,
823+ /* group = */ PLUGIN_NAME , buf , cpy_read_callback ,
820824 DOUBLE_TO_CDTIME_T (interval ),
821825 & (user_data_t ){
822826 .data = c ,
@@ -1153,7 +1157,7 @@ static void *cpy_interactive(void *pipefd) {
11531157 PyOS_setsig (SIGINT , cur_sig );
11541158 PyErr_Print ();
11551159 state = PyEval_SaveThread ();
1156- NOTICE ("python : Interactive interpreter exited, stopping collectd ..."
1160+ NOTICE (PLUGIN_NAME " : Interactive interpreter exited, stopping collectd ..."
11571161 pthread_kill (main_thread , SIGINT );
11581162 return NULL ;
11591163}
@@ -1165,20 +1169,20 @@ static int cpy_init(void) {
11651169 static pthread_t thread ;
11661170
11671171 if (!Py_IsInitialized ()) {
1168- WARNING ("python : Plugin loaded but not configured."
1169- plugin_unregister_shutdown ("python" );
1172+ WARNING (PLUGIN_NAME " : Plugin loaded but not configured."
1173+ plugin_unregister_shutdown (PLUGIN_NAME );
11701174 Py_Finalize ();
11711175 return 0 ;
11721176 }
11731177 main_thread = pthread_self ();
11741178 if (do_interactive ) {
11751179 if (pipe (pipefd )) {
1176- ERROR ("python : Unable to create pipe."
1180+ ERROR (PLUGIN_NAME " : Unable to create pipe."
11771181 return 1 ;
11781182 }
11791183 if (plugin_thread_create (& thread , NULL , cpy_interactive , pipefd + 1 ,
1180- "python interpreter"
1181- ERROR ("python : Error creating thread for interactive interpreter."
1184+ PLUGIN_NAME " interpreter"
1185+ ERROR (PLUGIN_NAME " : Error creating thread for interactive interpreter."
11821186 }
11831187 if (read (pipefd [0 ], & buf , 1 ))
11841188 ;
@@ -1290,13 +1294,13 @@ static int cpy_init_python(void) {
12901294 CollectdError = PyErr_NewException ("collectd.CollectdError" , NULL , errordict );
12911295 sys = PyImport_ImportModule ("sys" ); /* New reference. */
12921296 if (sys == NULL ) {
1293- cpy_log_exception ("python initialization"
1297+ cpy_log_exception (PLUGIN_NAME " initialization"
12941298 return 1 ;
12951299 }
12961300 sys_path = PyObject_GetAttrString (sys , "path" ); /* New reference. */
12971301 Py_DECREF (sys );
12981302 if (sys_path == NULL ) {
1299- cpy_log_exception ("python initialization"
1303+ cpy_log_exception (PLUGIN_NAME " initialization"
13001304 return 1 ;
13011305 }
13021306 PySys_SetArgv (1 , & argv );
@@ -1368,8 +1372,8 @@ static int cpy_config(oconfig_item_t *ci) {
13681372 continue ;
13691373 }
13701374#ifdef IS_PY3K
1371- ERROR ("python : \"Encoding\" was used in the config file but Python3 was "
1372- "used, which does not support changing encodings" );
1375+ ERROR (PLUGIN_NAME " : \"Encoding\" was used in the config file but "
1376+ "Python3 was used, which does not support changing encodings" );
13731377 status = 1 ;
13741378 sfree (encoding );
13751379 continue ;
@@ -1396,15 +1400,15 @@ static int cpy_config(oconfig_item_t *ci) {
13961400 continue ;
13971401 tb = PyImport_ImportModule ("traceback" ); /* New reference. */
13981402 if (tb == NULL ) {
1399- cpy_log_exception ("python initialization"
1403+ cpy_log_exception (PLUGIN_NAME " initialization"
14001404 status = 1 ;
14011405 continue ;
14021406 }
14031407 cpy_format_exception =
14041408 PyObject_GetAttrString (tb , "format_exception" ); /* New reference. */
14051409 Py_DECREF (tb );
14061410 if (cpy_format_exception == NULL ) {
1407- cpy_log_exception ("python initialization"
1411+ cpy_log_exception (PLUGIN_NAME " initialization"
14081412 status = 1 ;
14091413 }
14101414 } else if (strcasecmp (item -> key , "ModulePath" ) == 0 ) {
@@ -1417,19 +1421,19 @@ static int cpy_config(oconfig_item_t *ci) {
14171421 }
14181422 dir_object = cpy_string_to_unicode_or_bytes (dir ); /* New reference. */
14191423 if (dir_object == NULL ) {
1420- ERROR ("python plugin: Unable to convert \"%s\" to "
1424+ ERROR (PLUGIN_NAME " plugin: Unable to convert \"%s\" to "
14211425 "a python object." ,
14221426 dir );
14231427 free (dir );
1424- cpy_log_exception ("python initialization"
1428+ cpy_log_exception (PLUGIN_NAME " initialization"
14251429 status = 1 ;
14261430 continue ;
14271431 }
14281432 if (PyList_Insert (sys_path , 0 , dir_object ) != 0 ) {
1429- ERROR ("python plugin: Unable to prepend \"%s\" to "
1433+ ERROR (PLUGIN_NAME " plugin: Unable to prepend \"%s\" to "
14301434 "python module path." ,
14311435 dir );
1432- cpy_log_exception ("python initialization"
1436+ cpy_log_exception (PLUGIN_NAME " initialization"
14331437 status = 1 ;
14341438 }
14351439 Py_DECREF (dir_object );
@@ -1444,7 +1448,8 @@ static int cpy_config(oconfig_item_t *ci) {
14441448 }
14451449 module = PyImport_ImportModule (module_name ); /* New reference. */
14461450 if (module == NULL ) {
1447- ERROR ("python plugin: Error importing module \"%s\"." , module_name );
1451+ ERROR (PLUGIN_NAME " plugin: Error importing module \"%s\"." ,
1452+ module_name );
14481453 cpy_log_exception ("importing module" );
14491454 status = 1 ;
14501455 }
@@ -1464,8 +1469,8 @@ static int cpy_config(oconfig_item_t *ci) {
14641469 break ;
14651470 }
14661471 if (c == NULL ) {
1467- WARNING ("python plugin: Found a configuration for the \"%s\" plugin, "
1468- "but the plugin isn't loaded or didn't register "
1472+ WARNING (PLUGIN_NAME " plugin: Found a configuration for the \"%s\" "
1473+ "plugin, but the plugin isn't loaded or didn't register "
14691474 "a configuration callback." ,
14701475 name );
14711476 free (name );
@@ -1486,15 +1491,15 @@ static int cpy_config(oconfig_item_t *ci) {
14861491 } else
14871492 Py_DECREF (ret );
14881493 } else {
1489- ERROR ("python plugin: Unknown config key \"%s\"."item -> key );
1494+ ERROR (PLUGIN_NAME " plugin: Unknown config key \"%s\"."item -> key );
14901495 status = 1 ;
14911496 }
14921497 }
14931498 return status ;
14941499}
14951500
14961501void module_register (void ) {
1497- plugin_register_complex_config ("python" , cpy_config );
1498- plugin_register_init ("python" , cpy_init );
1499- plugin_register_shutdown ("python" , cpy_shutdown );
1502+ plugin_register_complex_config (PLUGIN_NAME , cpy_config );
1503+ plugin_register_init (PLUGIN_NAME , cpy_init );
1504+ plugin_register_shutdown (PLUGIN_NAME , cpy_shutdown );
15001505}
0 commit comments