X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Famqp.c;h=4089fc321ee5e04510e66fa1f1274a55d450cd2a;hb=9d9678b9e753ea0936612021f4f87f8092ab4e31;hp=f9777a9b2a6f390c4ed4eec927f0e01465538f16;hpb=e1fda36ff7e4b5f508b630b614b182e298d91fb7;p=collectd.git diff --git a/src/amqp.c b/src/amqp.c index f9777a9b..4089fc32 100644 --- a/src/amqp.c +++ b/src/amqp.c @@ -677,25 +677,21 @@ static void *camqp_subscribe_thread (void *user_data) /* {{{ */ status = camqp_connect (conf); if (status != 0) { - struct timespec ts_interval; ERROR ("amqp plugin: camqp_connect failed. " "Will sleep for %.3f seconds.", CDTIME_T_TO_DOUBLE (interval)); - CDTIME_T_TO_TIMESPEC (interval, &ts_interval); - nanosleep (&ts_interval, /* remaining = */ NULL); + nanosleep (&CDTIME_T_TO_TIMESPEC (interval), /* remaining = */ NULL); continue; } status = amqp_simple_wait_frame (conf->connection, &frame); if (status < 0) { - struct timespec ts_interval; ERROR ("amqp plugin: amqp_simple_wait_frame failed. " "Will sleep for %.3f seconds.", CDTIME_T_TO_DOUBLE (interval)); camqp_close_connection (conf); - CDTIME_T_TO_TIMESPEC (interval, &ts_interval); - nanosleep (&ts_interval, /* remaining = */ NULL); + nanosleep (&CDTIME_T_TO_TIMESPEC (interval), /* remaining = */ NULL); continue; } @@ -741,7 +737,7 @@ static int camqp_subscribe_init (camqp_config_t *conf) /* {{{ */ memset (tmp, 0, sizeof (*tmp)); status = plugin_thread_create (tmp, /* attr = */ NULL, - camqp_subscribe_thread, conf); + camqp_subscribe_thread, conf, "amqp subscribe"); if (status != 0) { char errbuf[1024];