summaryrefslogtreecommitdiffstats
path: root/dovetail/utils
diff options
context:
space:
mode:
authorMatthewLi <matthew.lijun@huawei.com>2017-01-05 02:02:13 -0500
committerMatthewLi <matthew.lijun@huawei.com>2017-01-13 03:56:42 -0500
commit60f1f328b2ebc94330dcbf5f4374684a410d3e92 (patch)
tree6ecfa056092718997d82651c14bf3f91b1f64490 /dovetail/utils
parent0c57358d86d0a1d155b66e3af015be5be7e80e79 (diff)
dovetail tool: command line
JIRA: DOVETAIL-173 details please see https://wiki.opnfv.org/display/dovetail/Dovetail+Command+Line Change-Id: Iff04b0df8c4e6310d35a45b9c8ba3c7b3b5e1105 Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
Diffstat (limited to 'dovetail/utils')
-rw-r--r--dovetail/utils/dovetail_logger.py3
-rw-r--r--dovetail/utils/dovetail_utils.py5
2 files changed, 5 insertions, 3 deletions
diff --git a/dovetail/utils/dovetail_logger.py b/dovetail/utils/dovetail_logger.py
index 685db8f7..0fe4103c 100644
--- a/dovetail/utils/dovetail_logger.py
+++ b/dovetail/utils/dovetail_logger.py
@@ -23,6 +23,7 @@
import logging
import os
+import sys
from dovetail_config import DovetailConfig as dt_cfg
@@ -36,7 +37,7 @@ class Logger:
self.logger.propagate = 0
self.logger.setLevel(logging.DEBUG)
- ch = logging.StreamHandler()
+ ch = logging.StreamHandler(sys.stdout)
formatter = logging.Formatter('%(asctime)s - %(name)s - '
'%(levelname)s - %(message)s')
ch.setFormatter(formatter)
diff --git a/dovetail/utils/dovetail_utils.py b/dovetail/utils/dovetail_utils.py
index 8c4865d8..960801a8 100644
--- a/dovetail/utils/dovetail_utils.py
+++ b/dovetail/utils/dovetail_utils.py
@@ -35,11 +35,12 @@ def exec_log(verbose, logger, msg, level, flush=False):
def exec_cmd(cmd, logger=None, exit_on_error=False, info=False,
- err_msg="", verbose=True):
+ exec_msg_on=True, err_msg="", verbose=True):
msg_err = ("The command '%s' failed." % cmd) if not err_msg else err_msg
msg_exec = ("Executing command: '%s'" % cmd)
level = 'info' if info else 'debug'
- exec_log(verbose, logger, msg_exec, level)
+ if exec_msg_on:
+ exec_log(verbose, logger, msg_exec, level)
p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE,
stderr=subprocess.PIPE)