This patch removes an extra "SIGNALS" section in the rrdcached.pod and

merges "[BUG] fixed hang in flush_file() introduced by per-file flush
condition". --  kevin brintnall

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk@1542 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/program/doc/rrdcached.pod b/program/doc/rrdcached.pod
index 8ed29794707bcd4fbaf34320731032fb5dbcbb8e..c75b9e0e415bc3bd317b9003432e93bb857f6928 100644 (file)
--- a/program/doc/rrdcached.pod
+++ b/program/doc/rrdcached.pod
@@ -451,16 +451,6 @@ updates WILL BE LOST>.
 
 =back
 
-=head1 SIGNALS
-
-=over 4
-
-=item SIGINT and SIGTERM
-
-The daemon exits normally on receipt of either of these signals.
-
-=back
-
 =head1 BUGS
 
 No known bugs at the moment.

diff --git a/program/src/rrd_daemon.c b/program/src/rrd_daemon.c
index e2330a8dc05c0c2d68c0746e1946652745cc224a..f92de21210af6c829243395e4fb776b9caf7d01a 100644 (file)
--- a/program/src/rrd_daemon.c
+++ b/program/src/rrd_daemon.c
@@ -814,10 +814,13 @@ static int flush_file (const char *filename) /* {{{ */
     return (ENOENT);
   }
 
-  /* Enqueue at head */
-  enqueue_cache_item (ci, HEAD);
+  if (ci->values_num > 0)
+  {
+    /* Enqueue at head */
+    enqueue_cache_item (ci, HEAD);
+    pthread_cond_wait(&ci->flushed, &cache_lock);
+  }
 
-  pthread_cond_wait(&ci->flushed, &cache_lock);
   pthread_mutex_unlock(&cache_lock);
 
   return (0);