mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-29 15:28:56 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
Otherwise it's hard to diagnose later if the daemon failed to start because
it thinks that it is already running.
This commit is contained in:
Ben Pfaff
2011-03-29 10:09:23 -07:00
parent 0dd17bfdfe
commit 2159de8391
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/daemon.c
View File

@@ -171,6 +171,8 @@ die_if_already_running(void)
pid_t pid = already_running(); pid_t pid = already_running();
if (pid) { if (pid) {
if (!overwrite_pidfile) { 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", ovs_fatal(0, "%s: already running as pid %ld",
get_pidfile(), (long int) pid); get_pidfile(), (long int) pid);
} else { } else {

6
python/ovs/daemon.py
View File

@@ -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"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with 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.""" ignore_existing_pidfile() has been called, terminate the program."""
if _already_running(): if _already_running():
if not _overwrite_pidfile: 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) sys.exit(1)
else: else:
logging.warn("%s: %s already running" logging.warn("%s: %s already running"