projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src/rrd_daemon.c: Remove remaining debug messages.
[rrdtool.git]
/
src
/
rrd_daemon.c
diff --git
a/src/rrd_daemon.c
b/src/rrd_daemon.c
index
3295c7e
..
bc44b81
100644
(file)
--- a/
src/rrd_daemon.c
+++ b/
src/rrd_daemon.c
@@
-310,9
+310,6
@@
static int enqueue_cache_item (cache_item_t *ci, /* {{{ */
{
int did_insert = 0;
{
int did_insert = 0;
- RRDD_LOG (LOG_DEBUG, "enqueue_cache_item: Adding %s to the update queue.",
- ci->file);
-
if (ci == NULL)
return (-1);
if (ci == NULL)
return (-1);
@@
-549,9
+546,6
@@
static void *queue_thread_main (void *args __attribute__((unused))) /* {{{ */
pthread_mutex_unlock (&cache_lock);
pthread_mutex_unlock (&cache_lock);
- RRDD_LOG (LOG_DEBUG, "queue_thread_main: rrd_update (%s, %i, %p)",
- file, values_num, (void *) values);
-
status = rrd_update_r (file, NULL, values_num, (void *) values);
if (status != 0)
{
status = rrd_update_r (file, NULL, values_num, (void *) values);
if (status != 0)
{
@@
-574,8
+568,6
@@
static void *queue_thread_main (void *args __attribute__((unused))) /* {{{ */
} /* while (do_shutdown == 0) */
pthread_mutex_unlock (&cache_lock);
} /* while (do_shutdown == 0) */
pthread_mutex_unlock (&cache_lock);
- RRDD_LOG (LOG_DEBUG, "queue_thread_main: Exiting.");
-
return (NULL);
} /* }}} void *queue_thread_main */
return (NULL);
} /* }}} void *queue_thread_main */
@@
-944,9
+936,6
@@
static int handle_request_update (int fd, /* {{{ */
ci->flags = CI_FLAGS_IN_TREE;
g_tree_insert (cache_tree, (void *) ci->file, (void *) ci);
ci->flags = CI_FLAGS_IN_TREE;
g_tree_insert (cache_tree, (void *) ci->file, (void *) ci);
-
- RRDD_LOG (LOG_DEBUG, "handle_request_update: Created new tree node %s.",
- ci->file);
} /* }}} */
assert (ci != NULL);
} /* }}} */
assert (ci != NULL);
@@
-1329,11
+1318,7
@@
static void *listen_thread_main (void *args __attribute__((unused))) /* {{{ */
int i;
for (i = 0; i < config_listen_address_list_len; i++)
int i;
for (i = 0; i < config_listen_address_list_len; i++)
- {
- RRDD_LOG (LOG_DEBUG, "listen_thread_main: config_listen_address_list[%i] "
- "= %s", i, config_listen_address_list[i]);
open_listen_socket (config_listen_address_list[i]);
open_listen_socket (config_listen_address_list[i]);
- }
if (config_listen_address_list_len < 1)
open_listen_socket (RRDCACHED_DEFAULT_ADDRESS);
if (config_listen_address_list_len < 1)
open_listen_socket (RRDCACHED_DEFAULT_ADDRESS);
@@
-1436,8
+1421,6
@@
static void *listen_thread_main (void *args __attribute__((unused))) /* {{{ */
}
pthread_mutex_unlock (&connetion_threads_lock);
}
pthread_mutex_unlock (&connetion_threads_lock);
- RRDD_LOG (LOG_DEBUG, "listen_thread_main: Exiting.");
-
return (NULL);
} /* }}} void *listen_thread_main */
return (NULL);
} /* }}} void *listen_thread_main */
@@
-1494,7
+1477,7
@@
static int daemonize (void) /* {{{ */
memset (&sa_term, 0, sizeof (sa_term));
sa_term.sa_handler = sig_term_handler;
memset (&sa_term, 0, sizeof (sa_term));
sa_term.sa_handler = sig_term_handler;
- sigaction (SIG
INT
, &sa_term, NULL);
+ sigaction (SIG
TERM
, &sa_term, NULL);
memset (&sa_pipe, 0, sizeof (sa_pipe));
sa_pipe.sa_handler = SIG_IGN;
memset (&sa_pipe, 0, sizeof (sa_pipe));
sa_pipe.sa_handler = SIG_IGN;
@@
-1525,14
+1508,10
@@
static int daemonize (void) /* {{{ */
static int cleanup (void) /* {{{ */
{
static int cleanup (void) /* {{{ */
{
- RRDD_LOG (LOG_DEBUG, "cleanup ()");
-
do_shutdown++;
do_shutdown++;
- RRDD_LOG (LOG_DEBUG, "cleanup: Joining queue_thread..");
pthread_cond_signal (&cache_cond);
pthread_join (queue_thread, /* return = */ NULL);
pthread_cond_signal (&cache_cond);
pthread_join (queue_thread, /* return = */ NULL);
- RRDD_LOG (LOG_DEBUG, "cleanup: done");
remove_pidfile ();
remove_pidfile ();