projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'pr/1033'
[collectd.git]
/
src
/
daemon
/
collectd.c
diff --git
a/src/daemon/collectd.c
b/src/daemon/collectd.c
index
eb5404f
..
1b9c374
100644
(file)
--- a/
src/daemon/collectd.c
+++ b/
src/daemon/collectd.c
@@
-308,7
+308,11
@@
static int do_init (void)
#endif
#if HAVE_LIBSTATGRAB
#endif
#if HAVE_LIBSTATGRAB
- if (sg_init ())
+ if (sg_init (
+# if HAVE_LIBSTATGRAB_0_90
+ 0
+# endif
+ ))
{
ERROR ("sg_init: %s", sg_str_error (sg_get_error ()));
return (-1);
{
ERROR ("sg_init: %s", sg_str_error (sg_get_error ()));
return (-1);
@@
-410,6
+414,7
@@
static int pidfile_remove (void)
} /* static int pidfile_remove (const char *file) */
#endif /* COLLECT_DAEMON */
} /* static int pidfile_remove (const char *file) */
#endif /* COLLECT_DAEMON */
+#ifdef KERNEL_LINUX
int notify_upstart (void)
{
const char *upstart_job = getenv("UPSTART_JOB");
int notify_upstart (void)
{
const char *upstart_job = getenv("UPSTART_JOB");
@@
-475,6
+480,7
@@
int notify_systemd (void)
close(fd);
return 1;
}
close(fd);
return 1;
}
+#endif /* KERNEL_LINUX */
int main (int argc, char **argv)
{
int main (int argc, char **argv)
{
@@
-594,9
+600,13
@@
int main (int argc, char **argv)
/*
* Only daemonize if we're not being supervised
/*
* Only daemonize if we're not being supervised
- * by upstart or systemd.
+ * by upstart or systemd
(when using Linux)
.
*/
*/
- if (daemonize && notify_upstart() == 0 && notify_systemd() == 0)
+ if (daemonize
+#ifdef KERNEL_LINUX
+ && notify_upstart() == 0 && notify_systemd() == 0
+#endif
+ )
{
if ((pid = fork ()) == -1)
{
{
if ((pid = fork ()) == -1)
{