stream default INFO, filehdr default DEBUG

The DEBUG log can be stored as file and pushed into artifacts.
Default sys.out level should be INFO. Stream level can be
changed to DEBUG if cli "-d" is enabled.
remove "-v" since it's not useful for a test framework

JIRA: YARDSTICK-507

Change-Id: I3caafd31a2caac73b0e3f33c2762c090e76c707e
Signed-off-by: rexlee8776 <limingjiang@huawei.com>

diff --git a/yardstick/__init__.py b/yardstick/__init__.py
index 1ad6eb0..e19be36 100644 (file)
--- a/yardstick/__init__.py
+++ b/yardstick/__init__.py
@@ -35,19 +35,18 @@ LOG = logging.getLogger(__name__)
 
 def _init_logging():
 
-    _LOG_STREAM_HDLR.setFormatter(_LOG_FORMATTER)
+    LOG.setLevel(logging.DEBUG)
 
+    _LOG_STREAM_HDLR.setFormatter(_LOG_FORMATTER)
+    if os.environ.get('CI_DEBUG', '').lower() in {'1', 'y', "yes", "true"}:
+        _LOG_STREAM_HDLR.setLevel(logging.DEBUG)
+    else:
+        _LOG_STREAM_HDLR.setLevel(logging.INFO)
     # don't append to log file, clobber
     _LOG_FILE_HDLR.setFormatter(_LOG_FORMATTER)
-    # set log file to store debug info
     _LOG_FILE_HDLR.setLevel(logging.DEBUG)
 
     del logging.root.handlers[:]
     logging.root.addHandler(_LOG_STREAM_HDLR)
     logging.root.addHandler(_LOG_FILE_HDLR)
     logging.debug("logging.root.handlers = %s", logging.root.handlers)
-
-    if os.environ.get('CI_DEBUG', '').lower() in {'1', 1, 'y', "yes", "true"}:
-        LOG.setLevel(logging.DEBUG)
-    else:
-        LOG.setLevel(logging.INFO)

diff --git a/yardstick/cmd/cli.py b/yardstick/cmd/cli.py
index 6281bb8..1f8dfee 100644 (file)
--- a/yardstick/cmd/cli.py
+++ b/yardstick/cmd/cli.py
@@ -20,7 +20,7 @@ from pkg_resources import get_distribution
 from argparse import RawDescriptionHelpFormatter
 from oslo_config import cfg
 
-from yardstick import _init_logging, LOG
+from yardstick import _init_logging, _LOG_STREAM_HDLR
 from yardstick.cmd.commands import task
 from yardstick.cmd.commands import runner
 from yardstick.cmd.commands import scenario
@@ -33,11 +33,7 @@ cli_opts = [
     cfg.BoolOpt('debug',
                 short='d',
                 default=False,
-                help='increase output verbosity to debug'),
-    cfg.BoolOpt('verbose',
-                short='v',
-                default=False,
-                help='increase output verbosity to info')
+                help='increase output verbosity to debug')
 ]
 CONF.register_cli_opts(cli_opts)
 
@@ -132,11 +128,8 @@ class YardstickCLI():
     def _handle_global_opts(self):
 
         _init_logging()
-        if CONF.verbose:
-            LOG.setLevel(logging.INFO)
-
         if CONF.debug:
-            LOG.setLevel(logging.DEBUG)
+            _LOG_STREAM_HDLR.setLevel(logging.DEBUG)
 
     def _dispath_func_notask(self):