X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Famqp.c;h=db65791626c69c0faf6b9e8feff87269a8f29f95;hb=cd35a6a4528cf78383266fbae770b9c7161fda25;hp=f0abd44b461a38c5c7fade0b1e96b92f11897ec7;hpb=488c2ca9e3f6f6082f192bdd5d737c6cd1298ba2;p=collectd.git diff --git a/src/amqp.c b/src/amqp.c index f0abd44b..db657916 100644 --- a/src/amqp.c +++ b/src/amqp.c @@ -543,6 +543,8 @@ static void *camqp_subscribe_thread (void *user_data) /* {{{ */ camqp_config_t *conf = user_data; int status; + cdtime_t interval = plugin_get_interval (); + while (subscriber_threads_running) { amqp_frame_t frame; @@ -551,8 +553,9 @@ static void *camqp_subscribe_thread (void *user_data) /* {{{ */ if (status != 0) { ERROR ("amqp plugin: camqp_connect failed. " - "Will sleep for %i seconds.", interval_g); - sleep (interval_g); + "Will sleep for %.3f seconds.", + CDTIME_T_TO_DOUBLE (interval)); + sleep (interval); continue; } @@ -560,9 +563,10 @@ static void *camqp_subscribe_thread (void *user_data) /* {{{ */ if (status < 0) { ERROR ("amqp plugin: amqp_simple_wait_frame failed. " - "Will sleep for %i seconds.", interval_g); + "Will sleep for %.3f seconds.", + CDTIME_T_TO_DOUBLE (interval)); camqp_close_connection (conf); - sleep (interval_g); + sleep (interval); continue; } @@ -606,7 +610,7 @@ static int camqp_subscribe_init (camqp_config_t *conf) /* {{{ */ tmp = subscriber_threads + subscriber_threads_num; memset (tmp, 0, sizeof (*tmp)); - status = pthread_create (tmp, /* attr = */ NULL, + status = plugin_thread_create (tmp, /* attr = */ NULL, camqp_subscribe_thread, conf); if (status != 0) {