From 97513f8c4e8a22cdb75fc7681f0e16e98a0aaf35 Mon Sep 17 00:00:00 2001
From: Gorka Eguileor <geguileo@redhat.com>
Date: Sun, 6 Mar 2016 22:53:30 +0100
Subject: [PATCH] Fix #9: Remove dependency from oslo_config

This patch replaces the parsing done by oslo_config with arg_parse in
order to remove the dependency on the external library.
---
 oslogmerger/oslogmerger.py | 79 ++++++++++++++++++++------------------
 setup.py                   |  5 ++-
 2 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/oslogmerger/oslogmerger.py b/oslogmerger/oslogmerger.py
index 0aa4d31..901d2cb 100644
--- a/oslogmerger/oslogmerger.py
+++ b/oslogmerger/oslogmerger.py
@@ -1,4 +1,5 @@
 from __future__ import print_function
+import argparse
 from datetime import datetime
 import hashlib
 import os
@@ -6,20 +7,11 @@ import sys
 import tempfile
 import urllib2
 
-from oslo_config import cfg
 
+__version__ = '1.0.3'
 
 EXTRALINES_PADDING = " " * 40
 CACHE_DIR = "%s/oslogmerger-cache/" % tempfile.gettempdir()
-CMDLINE_OPTS = [
-    cfg.StrOpt('log-base',
-               help='Base path for all the log files',
-               default=''),
-    cfg.StrOpt('log-postfix',
-               help='Append to all the log files path',
-               default=''),
-    cfg.MultiStrOpt('logfiles', positional=True, required=True)
-   ]
 
 
 class OpenStackLog:
@@ -99,29 +91,7 @@ class OpenStackLog:
             yield entry
 
 
-def help():
-    print ("""os-log-merger tool
-
-usage instructions:
-    os-log-merger /path/log_file1[:ALIAS] /path/log_file2[:ALIAS2] ..
-
-    The tool will read all the log files, sort entries based on datetime,
-and output the ordered sequence of log lines via stdout. A new column is
-appended after datetime containing the file path of the log line, or the
-alias. Use the aliases if you want shorter line lengths.
-
-    Logs are expected to contain lines in the following format:
-
-Y-m-d H:M:S.mmm PID LOG-LEVEL ............
-Y-m-d H:M:S.mmm PID LOG-LEVEL ............
-[  extra line info .....      ]
-""")
-
-
 def process_logs(log_base, files, log_postfix):
-    if not files:
-        help()
-        return 1
     all_entries = []
     filename_alias = {}
     for filename in files:
@@ -152,15 +122,48 @@ def process_logs(log_base, files, log_postfix):
                 [date_object.strftime("%Y-%m-%d %H:%M:%S.%f"),
                  filename_alias[filename], pid,
                  level, rest]).rstrip('\n'))
-    return 0
+
+
+def parse_args():
+    class MyParser(argparse.ArgumentParser):
+        """Class to print verbose help on error."""
+        def error(self, message):
+            self.print_help()
+            sys.stderr.write('\nerror: %s\n' % message)
+            sys.exit(2)
+
+    general_description = """os-log-merger tool
+
+    The tool will read all the log files, sort entries based on datetime,
+and output the ordered sequence of log lines via stdout. A new column is
+appended after datetime containing the file path of the log line, or the
+alias. Use the aliases if you want shorter line lengths.
+
+    Logs are expected to contain lines in the following format:
+
+Y-m-d H:M:S.mmm PID LOG-LEVEL ............
+Y-m-d H:M:S.mmm PID LOG-LEVEL ............
+[  extra line info .....      ]
+"""
+
+    parser = MyParser(description=general_description, version=__version__,
+                      argument_default='',
+                      formatter_class=argparse.RawTextHelpFormatter)
+    parser.add_argument('--log-base ', '-b', dest='log_base',
+                        help='Base path for all the log files')
+    parser.add_argument('--log-postfix ', '-p', dest='log_postfix',
+                        help='Append to all the log files path')
+    parser.add_argument('logfiles', nargs='+', metavar='log_file',
+                        help='File in the format of log_file[:ALIAS]')
+    return parser.parse_args()
 
 
 def main():
-    cfg.CONF.register_cli_opts(CMDLINE_OPTS)
-    cfg.CONF(project='os-log-merger', default_config_files=[])
-    sys.exit(process_logs(cfg.CONF.log_base,
-                          cfg.CONF.logfiles,
-                          cfg.CONF.log_postfix))
+    cfg = parse_args()
+    process_logs(cfg.log_base,
+                 cfg.logfiles,
+                 cfg.log_postfix)
+
 
 if __name__ == "__main__":
     main()
diff --git a/setup.py b/setup.py
index ec2e400..12dc518 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,7 @@
 from setuptools import setup, find_packages
 from codecs import open
 from os import path
+from oslogmerger.oslogmerger import __version__
 
 here = path.abspath(path.dirname(__file__))
 
@@ -11,7 +12,7 @@ with open(path.join(here, 'README.rst'), encoding='utf-8') as f:
 setup(
     name='os-log-merger',
 
-    version='1.0.3',
+    version=__version__,
     description='OpenStack Log merge tool',
     long_description=long_description,
 
@@ -54,7 +55,7 @@ setup(
     packages=find_packages(exclude=['contrib', 'docs', 'tests']),
 
     py_modules=['oslogmerger'],
-    install_requires=['oslo.config'],
+    install_requires=[],
     # extras_require={
     #    'dev': ['check-manifest'],
     #    'test': ['coverage'],