projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove vestigial support for Spanning Tree Protocol.
[openvswitch]
/
lib
/
daemon.c
diff --git
a/lib/daemon.c
b/lib/daemon.c
index 78f88a0f9bb4f0bab5d9a745a7570a28b9a1065d..c8033fbec79a6a6147d9c060d045bb45d3fa0030 100644
(file)
--- a/
lib/daemon.c
+++ b/
lib/daemon.c
@@
-18,8
+18,10
@@
#include "daemon.h"
#include <errno.h>
#include <fcntl.h>
#include "daemon.h"
#include <errno.h>
#include <fcntl.h>
+#include <signal.h>
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/resource.h>
#include <sys/wait.h>
#include <unistd.h>
#include "command-line.h"
#include <sys/wait.h>
#include <unistd.h>
#include "command-line.h"
@@
-30,10
+32,10
@@
#include "socket-util.h"
#include "timeval.h"
#include "util.h"
#include "socket-util.h"
#include "timeval.h"
#include "util.h"
-
-#define THIS_MODULE VLM_daemon
#include "vlog.h"
#include "vlog.h"
+VLOG_DEFINE_THIS_MODULE(daemon)
+
/* Should we run in the background? */
static bool detach;
/* Should we run in the background? */
static bool detach;
@@
-446,6
+448,10
@@
daemonize_start(void)
}
make_pidfile();
}
make_pidfile();
+
+ /* Make sure that the unixctl commands for vlog get registered in a
+ * daemon, even before the first log message. */
+ vlog_init();
}
/* If daemonization is configured, then this function notifies the parent
}
/* If daemonization is configured, then this function notifies the parent