Changeset 781897bd0a05bbae82234e01395da26f6542a4ae

Timestamp:

05/15/09 12:34:27 (4 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1242390867 +0000

git-parent:

[ea6ba4161f18ddc6b87d887e6bda5c05ae18ceef]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1242390867 +0000

Message:

Make SIGHUP perform reload, fixes #124

Files:

• src/noitd.c (modified) (3 diffs)

src/noitd.c

@@ -176 +176 @@
-    else {
-      int sig = -1, exit_val = -1;
+      signal(SIGHUP, SIG_IGN);
-      while(1) {
-        unsigned long ltt;
@@ -212 +213 @@
-}
-
+static int __reload_needed = 0;
+static void request_conf_reload(int sig) {
+  if(sig == SIGHUP) {
+    __reload_needed = 1;
+  }
+}
-static int watchdog_tick(eventer_t e, int mask, void *unused, struct timeval *now) {
-  it_ticks();
+  if(__reload_needed) {
+    noitL(noit_error, "SIGHUP received, performing reload\n");
+    if(noit_conf_load(config_file) == -1) {
+      noitL(noit_error, "Cannot load config: '%s'\n", config_file);
+      exit(-1);
+    }
+    __reload_needed = 0;
+  }
-  return 0;
-}
@@ -225 +240 @@
-    exit(-1);
-  }
+
+  signal(SIGHUP, request_conf_reload);
-
-  /* initialize the eventer */