projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ce252e1
)
Moved the signal handler initialization so it gets run in the child, not the parent..
author
octo
<octo>
Sun, 18 Dec 2005 12:16:05 +0000
(12:16 +0000)
committer
octo
<octo>
Sun, 18 Dec 2005 12:16:05 +0000
(12:16 +0000)
src/collectd.c
patch
|
blob
|
history
diff --git
a/src/collectd.c
b/src/collectd.c
index
a9b1ac8
..
247a185
100644
(file)
--- a/
src/collectd.c
+++ b/
src/collectd.c
@@
-262,9
+262,11
@@
static int pidfile_remove (const char *file)
int main (int argc, char **argv)
{
int main (int argc, char **argv)
{
+#if COLLECT_DAEMON
+ struct sigaction sigChldAction;
+#endif
struct sigaction sigIntAction;
struct sigaction sigTermAction;
struct sigaction sigIntAction;
struct sigaction sigTermAction;
- struct sigaction sigChldAction;
char *configfile = CONFIGFILE;
char *plugindir = PLUGINDIR;
char *datadir = PKGLOCALSTATEDIR;
char *configfile = CONFIGFILE;
char *plugindir = PLUGINDIR;
char *datadir = PKGLOCALSTATEDIR;
@@
-383,21
+385,12
@@
int main (int argc, char **argv)
}
/*
}
/*
- *
install signal handlers
+ *
fork off child
*/
*/
- sigIntAction.sa_handler = sigIntHandler;
- sigaction (SIGINT, &sigIntAction, NULL);
-
- sigIntAction.sa_handler = sigTermHandler;
- sigaction (SIGTERM, &sigTermAction, NULL);
-
+#if COLLECT_DAEMON
sigChldAction.sa_handler = SIG_IGN;
sigaction (SIGCHLD, &sigChldAction, NULL);
sigChldAction.sa_handler = SIG_IGN;
sigaction (SIGCHLD, &sigChldAction, NULL);
- /*
- * fork off child
- */
-#if COLLECT_DAEMON
if (daemonize)
{
if ((pid = fork ()) == -1)
if (daemonize)
{
if ((pid = fork ()) == -1)
@@
-444,6
+437,15
@@
int main (int argc, char **argv)
#endif /* COLLECT_DAEMON */
/*
#endif /* COLLECT_DAEMON */
/*
+ * install signal handlers
+ */
+ sigIntAction.sa_handler = sigIntHandler;
+ sigaction (SIGINT, &sigIntAction, NULL);
+
+ sigIntAction.sa_handler = sigTermHandler;
+ sigaction (SIGTERM, &sigTermAction, NULL);
+
+ /*
* run the actual loops
*/
#if HAVE_LIBRRD
* run the actual loops
*/
#if HAVE_LIBRRD