From: Tobias Oetiker <tobi@oetiker.ch>
Date: Mon, 5 Mar 2012 16:49:01 +0000 (+0000)
Subject: fix flush race in rrdcached -- Christian Hitz
X-Git-Tag: v1.5.0-rc1~227
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f4c61f292b4e2b646aac868b4805368d39cdce1;p=thirdparty%2Frrdtool-1.x.git

fix flush race in rrdcached -- Christian Hitz

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

diff --git a/src/rrd_daemon.c b/src/rrd_daemon.c
index 340ea153..2c81424a 100644
--- a/src/rrd_daemon.c
+++ b/src/rrd_daemon.c
@@ -295,7 +295,9 @@ static int handle_request_help (HANDLER_PROTO);
 static void sig_common (const char *sig) /* {{{ */
 {
   RRDD_LOG(LOG_NOTICE, "caught SIG%s", sig);
-  state = FLUSHING;
+  if (state == RUNNING) {
+      state = FLUSHING;
+  }
   pthread_cond_broadcast(&flush_cond);
   pthread_cond_broadcast(&queue_cond);
 } /* }}} void sig_common */