Merge "Bug: contrail-logs --help failed if --admin-user or --admin-pa…

…ssword is not correct"
Juniper · Feb 21, 2017 · a13926e · a13926e
2 parents cc6134c + 7031416
commit a13926e
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/opserver/log.py b/src/opserver/log.py
@@ -64,6 +64,10 @@ def run(self):
                     username = sys.argv[index]
                 elif arg == "--admin-password":
                     password = sys.argv[index]
+
+            if self.parse_args() != 0:
+                return
+
             tab_url = "http://" + analytics_api_ip + ":" +\
                 analytics_api_port + "/analytics/tables"
             tables = OpServerUtils.get_url_http(tab_url,
@@ -78,8 +82,7 @@ def run(self):
                             # For object table the mapping between the actual table
                             # name and the table name used in help msg are the same
                             OBJECT_TABLE_MAP[table['name']]=table['name']
-            if self.parse_args() != 0:
-                return
+
             if self._args.tail:
                 start_time = UTCTimestampUsec() - 10*pow(10,6)
                 while True: