daemon: Write "already running" message to log also.

Otherwise it's hard to diagnose later if the daemon failed to start because
it thinks that it is already running.

diff --git a/lib/daemon.c b/lib/daemon.c
index 2f6f08192016c03827047a14f4cc1c0e0b917e4e..17ec9f5e25de044a57aeed2f6f112ef6c60866e6 100644 (file)
--- a/lib/daemon.c
+++ b/lib/daemon.c
@@ -171,6 +171,8 @@ die_if_already_running(void)
     pid_t pid = already_running();
     if (pid) {
         if (!overwrite_pidfile) {
+            VLOG_ERR("%s: %s already running as pid %ld, aborting",
+                      get_pidfile(), program_name, (long int) pid);
             ovs_fatal(0, "%s: already running as pid %ld",
                       get_pidfile(), (long int) pid);
         } else {

diff --git a/python/ovs/daemon.py b/python/ovs/daemon.py
index 6dff3a02fcbd8e430a2c45f2ce7e21b58538e84c..83ae8cd1398d22f31a410ce94a1db78741e075e5 100644 (file)
--- a/python/ovs/daemon.py
+++ b/python/ovs/daemon.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010 Nicira Networks
+# Copyright (c) 2010, 2011 Nicira Networks
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -141,7 +141,9 @@ def die_if_already_running():
     ignore_existing_pidfile() has been called, terminate the program."""
     if _already_running():
         if not _overwrite_pidfile:
-            sys.stderr.write("%s: already running\n" % get_pidfile())
+            msg = "%s: already running" % _pidfile
+            logging.error("%s, aborting" % msg)
+            sys.stderr.write("%s\n" % msg)
             sys.exit(1)
         else:
             logging.warn("%s: %s already running"