From c38cd4bc703054bb77a5261a6b934dfc8e52c0c6 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Wed, 30 Sep 2009 12:24:46 -0700 Subject: [PATCH] xenserver: In xsconsole plugin, log via XSConsoleLog module. Part of a patch from Ian Campbell . --- ...sr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py b/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py index f3d9bf34..31a48c37 100644 --- a/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py +++ b/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py @@ -7,9 +7,7 @@ # Copyright (c) 2009 Nicira Networks. -import logging -log = logging.getLogger("vswitch-cfg-update") -logging.basicConfig(filename="/var/log/vswitch-xsplugin.log", level=logging.DEBUG) +from XSConsoleLog import * import os import socket @@ -36,7 +34,7 @@ class VSwitchService: try: output = ShellPipe(["service", self.name, "version"]).Stdout() except StandardError, e: - log.error("version retrieval error: " + str(e)) + XSLogError("vswitch version retrieval error: " + str(e)) return "" for line in output: if self.processname in line: @@ -47,7 +45,7 @@ class VSwitchService: try: output = ShellPipe(["service", self.name, "status"]).Stdout() except StandardError, e: - log.error("status retrieval error: " + str(e)) + XSLogError("vswitch status retrieval error: " + str(e)) return "" if len(output) == 0: return "" @@ -66,7 +64,7 @@ class VSwitchService: try: ShellPipe(["service", self.name, "restart"]).Call() except StandardError, e: - log.error("restart error: " + str(e)) + XSLogError("vswitch restart error: " + str(e)) @classmethod def Inst(cls, name, processname=None): @@ -85,7 +83,7 @@ class VSwitchConfig: output = ShellPipe([cfg_mod, "-vANY:console:emer", "-F", vswitchd_cfg_filename, "-q", key]).Stdout() except StandardError, e: - log.error("config retrieval error: " + str(e)) + XSLogError("config retrieval error: " + str(e)) return "" if len(output) == 0: -- 2.30.2