projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src/plugin.c: Stop write threads before calling shutdown callbacks.
[collectd.git]
/
src
/
collectdmon.c
diff --git
a/src/collectdmon.c
b/src/collectdmon.c
index
e496eb0
..
c81ca3f
100644
(file)
--- a/
src/collectdmon.c
+++ b/
src/collectdmon.c
@@
-19,6
+19,10
@@
* Sebastian Harl <sh at tokkee.org>
**/
* Sebastian Harl <sh at tokkee.org>
**/
+#if !defined(__GNUC__) || !__GNUC__
+# define __attribute__(x) /**/
+#endif
+
#include "config.h"
#include <assert.h>
#include "config.h"
#include <assert.h>
@@
-197,13
+201,13
@@
static int collectd_stop (void)
return 0;
} /* collectd_stop */
return 0;
} /* collectd_stop */
-static void sig_int_term_handler (int signo)
+static void sig_int_term_handler (int
__attribute__((unused))
signo)
{
++loop;
return;
} /* sig_int_term_handler */
{
++loop;
return;
} /* sig_int_term_handler */
-static void sig_hup_handler (int signo)
+static void sig_hup_handler (int
__attribute__((unused))
signo)
{
++restart;
return;
{
++restart;
return;
@@
-308,7
+312,10
@@
int main (int argc, char **argv)
openlog ("collectdmon", LOG_CONS | LOG_PID, LOG_DAEMON);
if (-1 == daemonize ())
openlog ("collectdmon", LOG_CONS | LOG_PID, LOG_DAEMON);
if (-1 == daemonize ())
+ {
+ free (collectd_argv);
return 1;
return 1;
+ }
sa.sa_handler = sig_int_term_handler;
sa.sa_flags = 0;
sa.sa_handler = sig_int_term_handler;
sa.sa_flags = 0;
@@
-316,11
+323,13
@@
int main (int argc, char **argv)
if (0 != sigaction (SIGINT, &sa, NULL)) {
syslog (LOG_ERR, "Error: sigaction() failed: %s", strerror (errno));
if (0 != sigaction (SIGINT, &sa, NULL)) {
syslog (LOG_ERR, "Error: sigaction() failed: %s", strerror (errno));
+ free (collectd_argv);
return 1;
}
if (0 != sigaction (SIGTERM, &sa, NULL)) {
syslog (LOG_ERR, "Error: sigaction() failed: %s", strerror (errno));
return 1;
}
if (0 != sigaction (SIGTERM, &sa, NULL)) {
syslog (LOG_ERR, "Error: sigaction() failed: %s", strerror (errno));
+ free (collectd_argv);
return 1;
}
return 1;
}
@@
-328,12
+337,7
@@
int main (int argc, char **argv)
if (0 != sigaction (SIGHUP, &sa, NULL)) {
syslog (LOG_ERR, "Error: sigaction() failed: %s", strerror (errno));
if (0 != sigaction (SIGHUP, &sa, NULL)) {
syslog (LOG_ERR, "Error: sigaction() failed: %s", strerror (errno));
- return 1;
- }
-
- sigaddset (&sa.sa_mask, SIGCHLD);
- if (0 != sigprocmask (SIG_BLOCK, &sa.sa_mask, NULL)) {
- syslog (LOG_ERR, "Error: sigprocmask() failed: %s", strerror (errno));
+ free (collectd_argv);
return 1;
}
return 1;
}