Fixes #6604: handle SIGHUP for cf-serverd and cf-execd.

cf-monitord doesn't have the same reloading framework, so will leave that one for now. Based on a patch by Nicolas CHARLES <nicolas.charles@normation.com>.
cfengine · Mar 27, 2015 · d0547c2 · d0547c2
1 parent 0549eaa
commit d0547c2
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 7 deletions.
diff --git a/cf-execd/cf-execd.c b/cf-execd/cf-execd.c
@@ -352,7 +352,7 @@ void StartServer(EvalContext *ctx, Policy *policy, GenericAgentConfig *config, E
     WritePID("cf-execd.pid");
     signal(SIGINT, HandleSignalsForDaemon);
     signal(SIGTERM, HandleSignalsForDaemon);
-    signal(SIGHUP, SIG_IGN);
+    signal(SIGHUP, HandleSignalsForDaemon);
     signal(SIGPIPE, SIG_IGN);
     signal(SIGUSR1, HandleSignalsForDaemon);
     signal(SIGUSR2, HandleSignalsForDaemon);
@@ -474,13 +474,26 @@ static Reload CheckNewPromises(GenericAgentConfig *config)
 
     time_t validated_at = ReadTimestampFromPolicyValidatedFile(config, NULL);
 
+    bool reload_config = false;
+
     if (config->agent_specific.daemon.last_validated_at < validated_at)
     {
+        Log(LOG_LEVEL_VERBOSE, "New promises detected...");
+        reload_config = true;
+    }
+    if (ReloadConfigRequested())
+    {
+        Log(LOG_LEVEL_VERBOSE, "Force reload of inputs files...");
+        reload_config = true;
+    }
+
+    if (reload_config)
+    {
+        ClearRequestReloadConfig();
+
         /* Rereading policies now, so update timestamp. */
         config->agent_specific.daemon.last_validated_at = validated_at;
 
-        Log(LOG_LEVEL_VERBOSE, "New promises detected...");
-
         if (GenericAgentArePromisesValid(config))
         {
             return RELOAD_FULL;

diff --git a/cf-serverd/cf-serverd-functions.c b/cf-serverd/cf-serverd-functions.c
@@ -357,13 +357,26 @@ static void CheckFileChanges(EvalContext *ctx, Policy **policy, GenericAgentConf
 
     time_t validated_at = ReadTimestampFromPolicyValidatedFile(config, NULL);
 
+    bool reload_config = false;
+
     if (config->agent_specific.daemon.last_validated_at < validated_at)
     {
+        Log(LOG_LEVEL_VERBOSE, "New promises detected...");
+        reload_config = true;
+    }
+    if (ReloadConfigRequested())
+    {
+        Log(LOG_LEVEL_VERBOSE, "Force reload of inputs files...");
+        reload_config = true;
+    }
+
+    if (reload_config)
+    {
+        ClearRequestReloadConfig();
+
         /* Rereading policies now, so update timestamp. */
         config->agent_specific.daemon.last_validated_at = validated_at;
 
-        Log(LOG_LEVEL_VERBOSE, "New promises detected...");
-
         if (GenericAgentArePromisesValid(config))
         {
             Log(LOG_LEVEL_NOTICE, "Rereading policy file '%s'",
@@ -563,7 +576,7 @@ static void InitSignals()
 
     signal(SIGINT, HandleSignalsForDaemon);
     signal(SIGTERM, HandleSignalsForDaemon);
-    signal(SIGHUP, SIG_IGN);
+    signal(SIGHUP, HandleSignalsForDaemon);
     signal(SIGPIPE, SIG_IGN);
     signal(SIGUSR1, HandleSignalsForDaemon);
     signal(SIGUSR2, HandleSignalsForDaemon);

diff --git a/libpromises/signals.c b/libpromises/signals.c
@@ -26,13 +26,24 @@
 
 static bool PENDING_TERMINATION = false; /* GLOBAL_X */
 
+static bool RELOAD_CONFIG = false; /* GLOBAL_X */
 /********************************************************************/
 
 bool IsPendingTermination(void)
 {
     return PENDING_TERMINATION;
 }
 
+bool ReloadConfigRequested(void)
+{
+    return RELOAD_CONFIG;
+}
+
+void ClearRequestReloadConfig()
+{
+    RELOAD_CONFIG = false;
+}
+
 /********************************************************************/
 
 static int SIGNAL_PIPE[2] = { -1, -1 }; /* GLOBAL_C */
@@ -160,7 +171,6 @@ void HandleSignalsForDaemon(int signum)
     {
     case SIGTERM:
     case SIGINT:
-    case SIGHUP:
     case SIGSEGV:
     case SIGKILL:
         PENDING_TERMINATION = true;
@@ -171,6 +181,9 @@ void HandleSignalsForDaemon(int signum)
     case SIGUSR2:
         LogSetGlobalLevel(LOG_LEVEL_NOTICE);
         break;
+    case SIGHUP:
+        RELOAD_CONFIG = true;
+        break;
     case SIGPIPE:
     default:
         /* No action */

diff --git a/libpromises/signals.h b/libpromises/signals.h
@@ -30,6 +30,9 @@
 // check whether the running daemon should terminate after having received a signal.
 bool IsPendingTermination(void);
 
+bool ReloadConfigRequested(void);
+void ClearRequestReloadConfig();
+
 void MakeSignalPipe(void);
 int GetSignalPipe(void);
 void HandleSignalsForDaemon(int signum);