ovs-xapi-sync: Make pychecker-able.

[sliver-openvswitch.git] / xenserver / usr_share_openvswitch_scripts_ovs-xapi-sync

diff --git a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
index 0296621..57dc2e3 100755 (executable)
--- a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
+++ b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
@@ -38,14 +38,7 @@ import ovs.util
 import ovs.daemon
 import ovs.db.idl
 
-s_log     = logging.getLogger("ovs-xapi-sync")
-l_handler = logging.handlers.RotatingFileHandler(
-        "/var/log/openvswitch/ovs-xapi-sync.log")
-l_formatter = logging.Formatter('%(filename)s: %(levelname)s: %(message)s')
-l_handler.setFormatter(l_formatter)
-s_log.addHandler(l_handler)
-s_log.setLevel(logging.INFO)
-
+s_log = logging.getLogger("ovs-xapi-sync")
 vsctl="/usr/bin/ovs-vsctl"
 session = None
 force_run = False
@@ -118,7 +111,7 @@ def get_iface_id(if_name, xs_vif_uuid):
         return xs_vif_uuid
 
 def call_vsctl(args):
-    cmd = [vsctl, "--timeout=30", "-vANY:console:emer"] + args
+    cmd = [vsctl, "--timeout=30", "-vANY:console:off"] + args
     exitcode = subprocess.call(cmd)
     if exitcode != 0:
         s_log.warning("Couldn't call ovs-vsctl")
@@ -263,6 +256,13 @@ def update_tap_from_vif(idl, tap_name, vif_name):
 def main(argv):
     global force_run
 
+    l_handler = logging.handlers.RotatingFileHandler(
+            "/var/log/openvswitch/ovs-xapi-sync.log")
+    l_formatter = logging.Formatter('%(filename)s: %(levelname)s: %(message)s')
+    l_handler.setFormatter(l_formatter)
+    s_log.addHandler(l_handler)
+    s_log.setLevel(logging.INFO)
+
     try:
         options, args = getopt.gnu_getopt(
             argv[1:], 'h', ['help'] + ovs.daemon.LONG_OPTIONS)