summaryrefslogtreecommitdiff
path: root/xenserver/opt_xensource_libexec_InterfaceReconfigure.py
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2010-02-22 16:26:50 -0800
committerBen Pfaff <blp@nicira.com>2010-02-23 09:55:44 -0800
commitb63fadcfdc8a96ddb5e944b60733edf21999a1ad (patch)
tree684e49d2d32785b087550bcae18a905d35e1f782 /xenserver/opt_xensource_libexec_InterfaceReconfigure.py
parent64ddb6fecfe21a7b50c5907dd88de67a87ec6eca (diff)
downloadopenvswitch-b63fadcfdc8a96ddb5e944b60733edf21999a1ad.tar.gz
xenserver: Add --no-syslog feature to interface-reconfigure.
This makes it easier to do unit tests (some of which will be added in an upcoming commit) by allowing messages to be read from stderr instead of having to somehow intercept syslog calls. Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'xenserver/opt_xensource_libexec_InterfaceReconfigure.py')
-rw-r--r--xenserver/opt_xensource_libexec_InterfaceReconfigure.py16
1 files changed, 15 insertions, 1 deletions
diff --git a/xenserver/opt_xensource_libexec_InterfaceReconfigure.py b/xenserver/opt_xensource_libexec_InterfaceReconfigure.py
index 576c36985..c7a231a8b 100644
--- a/xenserver/opt_xensource_libexec_InterfaceReconfigure.py
+++ b/xenserver/opt_xensource_libexec_InterfaceReconfigure.py
@@ -10,6 +10,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
+import sys
import syslog
import os
@@ -25,12 +26,25 @@ def set_root_prefix(prefix):
global the_root_prefix
the_root_prefix = prefix
+log_destination = "syslog"
+def get_log_destination():
+ """Returns the current log destination.
+ 'syslog' means "log to syslog".
+ 'stderr' means "log to stderr"."""
+ return log_destination
+def set_log_destination(dest):
+ global log_destination
+ log_destination = dest
+
#
# Logging.
#
def log(s):
- syslog.syslog(s)
+ if get_log_destination() == 'syslog':
+ syslog.syslog(s)
+ else:
+ print >>sys.stderr, s
#
# Exceptions.