Prepare for post-1.6.0 (1.6.90).

[openvswitch] / python / ovs / stream.py

diff --git a/python/ovs/stream.py b/python/ovs/stream.py
index 5180642dead01861504fb024e2779d28887aa5d4..7ea9e46e8b59c7b6d175460ef31a268d5b8f1607 100644 (file)
--- a/python/ovs/stream.py
+++ b/python/ovs/stream.py
@@ -13,13 +13,15 @@
 # limitations under the License.
 
 import errno
-import logging
 import os
 import select
 import socket
 
 import ovs.poller
 import ovs.socket_util
+import ovs.vlog
+
+vlog = ovs.vlog.Vlog("stream")
 
 
 class Stream(object):
@@ -260,7 +262,7 @@ class PassiveStream(object):
         try:
             sock.listen(10)
         except socket.error, e:
-            logging.error("%s: listen: %s" % (name, os.strerror(e.error)))
+            vlog.err("%s: listen: %s" % (name, os.strerror(e.error)))
             sock.close()
             return e.error, None
 
@@ -291,7 +293,7 @@ class PassiveStream(object):
                 error = ovs.socket_util.get_exception_errno(e)
                 if error != errno.EAGAIN:
                     # XXX rate-limit
-                    logging.debug("accept: %s" % os.strerror(error))
+                    vlog.dbg("accept: %s" % os.strerror(error))
                 return error, None
 
     def wait(self, poller):
@@ -302,14 +304,10 @@ class PassiveStream(object):
         self.socket.close()
 
 
-def usage(name, active, passive):
-    print
-    if active:
-        print("Active %s connection methods:" % name)
-        print("  unix:FILE               "
-               "Unix domain socket named FILE")
+def usage(name):
+    return """
+Active %s connection methods:
+  unix:FILE               Unix domain socket named FILE
 
-    if passive:
-        print("Passive %s connection methods:" % name)
-        print("  punix:FILE              "
-              "listen on Unix domain socket FILE")
+Passive %s connection methods:
+  punix:FILE              Listen on Unix domain socket FILE""" % (name, name)