src/rrd_daemon.c: Instann the SIGTERM handler correctly.

[rrdtool.git] / src / rrd_daemon.c

diff --git a/src/rrd_daemon.c b/src/rrd_daemon.c
index ac974ed..7a80220 100644 (file)
--- a/src/rrd_daemon.c
+++ b/src/rrd_daemon.c
@@ -166,8 +166,8 @@ static char **config_listen_address_list = NULL;
 static int config_listen_address_list_len = 0;
 
 static uint64_t stats_queue_length = 0;
-static uint64_t stats_updates_total = 0;
-static uint64_t stats_values_total = 0;
+static uint64_t stats_updates_written = 0;
+static uint64_t stats_data_sets_written = 0;
 static pthread_mutex_t stats_lock = PTHREAD_MUTEX_INITIALIZER;
 
 /* 
@@ -565,8 +565,8 @@ static void *queue_thread_main (void *args __attribute__((unused))) /* {{{ */
       free (values[i]);
 
     pthread_mutex_lock (&stats_lock);
-    stats_updates_total++;
-    stats_values_total += values_num;
+    stats_updates_written++;
+    stats_data_sets_written += values_num;
     pthread_mutex_unlock (&stats_lock);
 
     pthread_mutex_lock (&cache_lock);
@@ -785,21 +785,21 @@ static int handle_request_stats (int fd, /* {{{ */
   char outbuf[4096];
 
   uint64_t copy_queue_length;
-  uint64_t copy_updates_total;
-  uint64_t copy_values_total;
+  uint64_t copy_updates_written;
+  uint64_t copy_data_sets_written;
 
-  uint64_t tree_nodes;
+  uint64_t tree_nodes_number;
   uint64_t tree_depth;
 
   pthread_mutex_lock (&stats_lock);
-  copy_queue_length  = stats_queue_length;
-  copy_updates_total = stats_updates_total;
-  copy_values_total  = stats_values_total;
+  copy_queue_length       = stats_queue_length;
+  copy_updates_written    = stats_updates_written;
+  copy_data_sets_written  = stats_data_sets_written;
   pthread_mutex_unlock (&stats_lock);
 
   pthread_mutex_lock (&cache_lock);
-  tree_nodes = (uint64_t) g_tree_nnodes (cache_tree);
-  tree_depth = (uint64_t) g_tree_height (cache_tree);
+  tree_nodes_number = (uint64_t) g_tree_nnodes (cache_tree);
+  tree_depth        = (uint64_t) g_tree_height (cache_tree);
   pthread_mutex_unlock (&cache_lock);
 
 #define RRDD_STATS_SEND \
@@ -820,15 +820,15 @@ static int handle_request_stats (int fd, /* {{{ */
   RRDD_STATS_SEND;
 
   snprintf (outbuf, sizeof (outbuf),
-      "UpdatesWritten: %"PRIu64"\n", copy_updates_total);
+      "UpdatesWritten: %"PRIu64"\n", copy_updates_written);
   RRDD_STATS_SEND;
 
   snprintf (outbuf, sizeof (outbuf),
-      "ValuesWritten: %"PRIu64"\n", copy_values_total);
+      "DataSetsWritten: %"PRIu64"\n", copy_data_sets_written);
   RRDD_STATS_SEND;
 
   snprintf (outbuf, sizeof (outbuf),
-      "TreeNodesNumber: %"PRIu64"\n", tree_nodes);
+      "TreeNodesNumber: %"PRIu64"\n", tree_nodes_number);
   RRDD_STATS_SEND;
 
   snprintf (outbuf, sizeof (outbuf),
@@ -836,6 +836,7 @@ static int handle_request_stats (int fd, /* {{{ */
   RRDD_STATS_SEND;
 
   return (0);
+#undef RRDD_STATS_SEND
 } /* }}} int handle_request_stats */
 
 static int handle_request_flush (int fd, /* {{{ */
@@ -887,13 +888,25 @@ static int handle_request_update (int fd, /* {{{ */
   cache_item_t *ci;
   char answer[4096];
 
+#define RRDD_UPDATE_SEND \
+  answer[sizeof (answer) - 1] = 0; \
+  status = swrite (fd, answer, strlen (answer)); \
+  if (status < 0) \
+  { \
+    status = errno; \
+    RRDD_LOG (LOG_INFO, "handle_request_update: swrite returned an error."); \
+    return (status); \
+  }
+
   now = time (NULL);
 
   status = buffer_get_field (&buffer, &buffer_size, &file);
   if (status != 0)
   {
-    RRDD_LOG (LOG_INFO, "handle_request_update: Cannot get file name.");
-    return (-1);
+    strncpy (answer, "-1 Usage: UPDATE <filename> <values> [<values> ...]\n",
+        sizeof (answer));
+    RRDD_UPDATE_SEND;
+    return (0);
   }
 
   pthread_mutex_lock (&cache_lock);
@@ -906,7 +919,10 @@ static int handle_request_update (int fd, /* {{{ */
     {
       pthread_mutex_unlock (&cache_lock);
       RRDD_LOG (LOG_ERR, "handle_request_update: malloc failed.");
-      return (-1);
+
+      strncpy (answer, "-1 malloc failed.\n", sizeof (answer));
+      RRDD_UPDATE_SEND;
+      return (0);
     }
     memset (ci, 0, sizeof (cache_item_t));
 
@@ -914,9 +930,12 @@ static int handle_request_update (int fd, /* {{{ */
     if (ci->file == NULL)
     {
       pthread_mutex_unlock (&cache_lock);
-      RRDD_LOG (LOG_ERR, "handle_request_update: malloc failed.");
       free (ci);
-      return (-1);
+      RRDD_LOG (LOG_ERR, "handle_request_update: strdup failed.");
+
+      strncpy (answer, "-1 strdup failed.\n", sizeof (answer));
+      RRDD_UPDATE_SEND;
+      return (0);
     }
 
     ci->values = NULL;
@@ -973,19 +992,18 @@ static int handle_request_update (int fd, /* {{{ */
 
   pthread_mutex_unlock (&cache_lock);
 
-  snprintf (answer, sizeof (answer), "0 Enqueued %i value%s\n", values_num,
-      (values_num == 1) ? "" : "s");
-  answer[sizeof (answer) - 1] = 0;
-
-  status = swrite (fd, answer, strlen (answer));
-  if (status < 0)
+  if (values_num < 1)
   {
-    status = errno;
-    RRDD_LOG (LOG_INFO, "handle_request_update: swrite returned an error.");
-    return (status);
+    strncpy (answer, "-1 No values updated.\n", sizeof (answer));
   }
-
+  else
+  {
+    snprintf (answer, sizeof (answer), "0 Enqueued %i value%s\n", values_num,
+        (values_num == 1) ? "" : "s");
+  }
+  RRDD_UPDATE_SEND;
   return (0);
+#undef RRDD_UPDATE_SEND
 } /* }}} int handle_request_update */
 
 static int handle_request (int fd) /* {{{ */
@@ -1476,7 +1494,7 @@ static int daemonize (void) /* {{{ */
 
   memset (&sa_term, 0, sizeof (sa_term));
   sa_term.sa_handler = sig_term_handler;
-  sigaction (SIGINT, &sa_term, NULL);
+  sigaction (SIGTERM, &sa_term, NULL);
 
   memset (&sa_pipe, 0, sizeof (sa_pipe));
   sa_pipe.sa_handler = SIG_IGN;