From f2c5e54368743bb910da3bd90aed7e7ad441dd11 Mon Sep 17 00:00:00 2001
From: Marin Atanasov Nikolov <dnaeon@gmail.com>
Date: Tue, 15 Oct 2013 16:23:03 +0300
Subject: [PATCH] Replace the -l flag with -o for specifying the output file

---
 src/vmpoller-client | 12 ++++++------
 src/vmpoller-proxy  |  8 ++++----
 src/vmpoller-worker |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/vmpoller-client b/src/vmpoller-client
index 02427e4..0ee2c54 100755
--- a/src/vmpoller-client
+++ b/src/vmpoller-client
@@ -40,9 +40,9 @@ def main():
 
     usage="""
 Usage:
-  vmpoller-client [-r <retries>] [-t <timeout>] [-l <logfile>] (-D|-H) -c discover -V <vcenter> -e <endpoint>
-  vmpoller-client [-r <retries>] [-t <timeout>] [-l <logfile>] -H -n <name> -p <property> -c poll -V <vcenter> -e <endpoint>
-  vmpoller-client [-r <retries>] [-t <timeout>] [-l <logfile>] -D -u <datastore-url> -p <property> -c poll -V <vcenter> -e <endpoint>
+  vmpoller-client [-r <retries>] [-t <timeout>] [-o <logfile>] (-D|-H) -c discover -V <vcenter> -e <endpoint>
+  vmpoller-client [-r <retries>] [-t <timeout>] [-o <logfile>] -H -n <name> -p <property> -c poll -V <vcenter> -e <endpoint>
+  vmpoller-client [-r <retries>] [-t <timeout>] [-o <logfile>] -D -u <datastore-url> -p <property> -c poll -V <vcenter> -e <endpoint>
   vmpoller-client --help
   vmpoller-client --version
 
@@ -60,19 +60,19 @@ Options:
   -t <timeout>, --timeout <timeout>         Timeout after that period of milliseconds [default: 3000]
   -e <endpoint>, --endpoint <endpoint>      Endpoint of ZeroMQ Proxy/Broker the client connects to
                                             [default: tcp://localhost:10123]
-  -l <logfile>, --logfile <logfile>         Specify the log file to use when performing the poll
+  -o <logfile>, --output <logfile>          Specify the log file to use when performing the poll
                                             [default: /var/log/vmpoller/vmpoller-client.log]
 
 """
 
     args = docopt(usage, version="1.0.0")
 
-    if args["--logfile"] == "-":
+    if args["--output"] == "-":
         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"],
+        logging.basicConfig(filename=args["--output"],
                             format='%(asctime)s - %(levelname)s - vmpoller-client[%(process)s]: %(message)s',
                             level=logging.DEBUG)
         
diff --git a/src/vmpoller-proxy b/src/vmpoller-proxy
index 52f218d..3bd4843 100755
--- a/src/vmpoller-proxy
+++ b/src/vmpoller-proxy
@@ -92,7 +92,7 @@ def status(endpoint):
 def main():
 
     usage="""
-Usage: vmpoller-proxy [-d] [-p <pidfile>] [-f <config-file>] [-l <logfile>] start
+Usage: vmpoller-proxy [-d] [-p <pidfile>] [-f <config-file>] [-o <logfile>] start
        vmpoller-proxy -e <endpoint> stop
        vmpoller-proxy -e <endpoint> status
        vmpoller-proxy --help
@@ -113,19 +113,19 @@ Options:
   -f <config-file>, --config <config-file>  Specify config file to use
                                             [default: /etc/vmpoller/vmpoller-proxy.conf]
   -e <endpoint>, --endpoint <endpoint>      Specify the endpoint we connect to
-  -l <logfile>, --logfile <logfile>         Specify the logfile to use
+  -o <logfile>, --output <logfile>          Specify the logfile to use
                                             [default: /var/log/vmpoller/vmpoller-proxy.log]
 
 """
 
     args = docopt(usage, version="1.0.0")
 
-    if args["--logfile"] == "-":
+    if args["--output"] == "-":
         logging.basicConfig(stream=stdout,
                             format='%(asctime)s - %(levelname)s - vmpoller-proxy[%(process)s]: %(message)s',
                             level=logging.DEBUG)
     else:
-        logging.basicConfig(filename=args["--logfile"],
+        logging.basicConfig(filename=args["--output"],
                             format='%(asctime)s - %(levelname)s - vmpoller-proxy[%(process)s]: %(message)s',
                             level=logging.DEBUG)
     
diff --git a/src/vmpoller-worker b/src/vmpoller-worker
index e227ee3..16a59fd 100755
--- a/src/vmpoller-worker
+++ b/src/vmpoller-worker
@@ -94,7 +94,7 @@ def status(endpoint):
 
 def main():
     usage="""
-Usage: vmpoller-worker [-d] [-p <pidfile>] [-f <config-file>] [-l <logfile>] start
+Usage: vmpoller-worker [-d] [-p <pidfile>] [-f <config-file>] [-o <logfile>] start
        vmpoller-worker -e <endpoint> stop
        vmpoller-worker -e <endpoint> status
        vmpoller-worker --help
@@ -115,19 +115,19 @@ Options:
   -f <config-file>, --config <config-file>  Specify config file to use
                                             [default: /etc/vmpoller/vmpoller-worker.conf]
   -e <endpoint>, --endpoint <endpoint>      Specify the endpoint we connect to
-  -l <logfile>, --logfile <logfile>         Specify the logfile to use
+  -o <logfile>, --output <logfile>          Specify the logfile to use
                                             [default: /var/log/vmpoller/vmpoller-worker.log]
 
 """
 
     args = docopt(usage, version="1.0.0")
 
-    if args["--logfile"] == "-":
+    if args["--output"] == "-":
         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"],
+        logging.basicConfig(filename=args["--output"],
                             format='%(asctime)s - %(levelname)s - vmpoller-worker[%(process)s]: %(message)s',
                             level=logging.DEBUG)