Be able to use "-" to specify stdout be used for logging

dnaeon · Sep 13, 2013 · 148375b · 148375b
1 parent 7d7df1a
commit 148375b
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 10 deletions.
diff --git a/src/vmpoller-client b/src/vmpoller-client
@@ -30,6 +30,7 @@ vmpoller-client is an application used for polling objects' information from a V
 It is intended to be integrated into a Zabbix template for polling of ESX hosts and Datastores properties.
 """
 
+import sys
 import logging
 
 from vmpoller.core import VMPollerClient
@@ -65,10 +66,15 @@ Options:
 
     args = docopt(usage, version="1.0.0")
 
-    logging.basicConfig(filename=args["--logfile"],
-                        format='%(asctime)s - %(levelname)s - vmpoller-client[%(process)s]: %(message)s',
-                        level=logging.DEBUG)
-
+    if args["--logfile"] == "-":
+        logging.basicConfig(stream=sys.stdout,
+                            format='%(asctime)s - %(levelname)s - vmpoller-client[%(process)s]: %(message)s',
+                            level=logging.DEBUG)
+    else:
+        logging.basicConfig(filename=args["--logfile"],
+                            format='%(asctime)s - %(levelname)s - vmpoller-client[%(process)s]: %(message)s',
+                            level=logging.DEBUG)
+
     client = VMPollerClient(endpoint=args["--endpoint"], retries=int(args["--retries"]), timeout=int(args["--timeout"]))
 
     msg = { "type":    "hosts" if args["--hosts"] else "datastores",

diff --git a/src/vmpoller-proxy b/src/vmpoller-proxy
@@ -30,6 +30,7 @@ between a pool of ZeroMQ workers.
 
 """
 
+import sys
 import logging
 
 from vmpoller.core import VMPollerProxy, VMPollerClient
@@ -108,9 +109,14 @@ Options:
 
     args = docopt(usage, version="1.0.0")
 
-    logging.basicConfig(filename=args["--logfile"],
-                        format='%(asctime)s - %(levelname)s - vmpoller-proxy[%(process)s]: %(message)s',
-                        level=logging.DEBUG)
+    if args["--logfile"] == "-":
+        logging.basicConfig(stream=stdout,
+                            format='%(asctime)s - %(levelname)s - vmpoller-proxy[%(process)s]: %(message)s',
+                            level=logging.DEBUG)
+    else:
+        logging.basicConfig(filename=args["--logfile"],
+                            format='%(asctime)s - %(levelname)s - vmpoller-proxy[%(process)s]: %(message)s',
+                            level=logging.DEBUG)
 
     if args["start"]:
         start(args["--pidfile"], args["--config"], args["--daemon"])

diff --git a/src/vmpoller-worker b/src/vmpoller-worker
@@ -33,6 +33,7 @@ performing the actual polling from a vCenter server.
 
 """
 
+import sys
 import logging
 
 from vmpoller.core import VMPollerWorker, VMPollerClient
@@ -110,9 +111,14 @@ Options:
 
     args = docopt(usage, version="1.0.0")
 
-    logging.basicConfig(filename=args["--logfile"],
-                        format='%(asctime)s - %(levelname)s - vmpoller-worker[%(process)s]: %(message)s',
-                        level=logging.DEBUG)
+    if args["--logfile"] == "-":
+        logging.basicConfig(stream=sys.stdout,
+                            format='%(asctime)s - %(levelname)s - vmpoller-worker[%(process)s]: %(message)s',
+                            level=logging.DEBUG)
+    else:
+        logging.basicConfig(filename=args["--logfile"],
+                            format='%(asctime)s - %(levelname)s - vmpoller-worker[%(process)s]: %(message)s',
+                            level=logging.DEBUG)
 
     if args["start"]:
         start(args["--pidfile"], args["--config"], args["--daemon"])