#include "socket-util.h"
#include "timeval.h"
#include "util.h"
-
-#define THIS_MODULE VLM_daemon
#include "vlog.h"
-/* Should we run in the background? */
+VLOG_DEFINE_THIS_MODULE(daemon)
+
+/* --detach: Should we run in the background? */
static bool detach;
-/* Name of pidfile (null if none). */
+/* --pidfile: Name of pidfile (null if none). */
static char *pidfile;
-/* Create pidfile even if one already exists and is locked? */
+/* --overwrite-pidfile: Create pidfile even if one already exists and is
+ locked? */
static bool overwrite_pidfile;
-/* Should we chdir to "/"? */
+/* --no-chdir: Should we chdir to "/"? */
static bool chdir_ = true;
/* File descriptor used by daemonize_start() and daemonize_complete(). */
/* Returns the file name that would be used for a pidfile if 'name' were
* provided to set_pidfile(). The caller must free the returned string. */
char *
-make_pidfile_name(const char *name)
+make_pidfile_name(const char *name)
{
return (!name
? xasprintf("%s/%s.pid", ovs_rundir, program_name)
}
}
-/* If a pidfile has been configured, creates it and stores the running process'
- * pid init. Ensures that the pidfile will be deleted when the process
- * exits. */
+/* If a pidfile has been configured, creates it and stores the running
+ * process's pid in it. Ensures that the pidfile will be deleted when the
+ * process exits. */
static void
make_pidfile(void)
{
}
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