Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fix src/dst ip update in ixia configuration"
[yardstick.git]
/
yardstick
/
__init__.py
diff --git
a/yardstick/__init__.py
b/yardstick/__init__.py
index
2f5ae9f
..
b673e7c
100644
(file)
--- a/
yardstick/__init__.py
+++ b/
yardstick/__init__.py
@@
-10,21
+10,13
@@
from __future__ import absolute_import
import logging
import os
from __future__ import absolute_import
import logging
import os
-import sys
-import yardstick.vTC.apexlake as apexlake
from yardstick.common import constants
from yardstick.common import utils as yardstick_utils
from yardstick.common import constants
from yardstick.common import utils as yardstick_utils
-# Hack to be able to run apexlake unit tests
-# without having to install apexlake.
-sys.path.append(os.path.dirname(apexlake.__file__))
-
yardstick_utils.makedirs(constants.LOG_DIR)
LOG_FILE = os.path.join(constants.LOG_DIR, 'yardstick.log')
yardstick_utils.makedirs(constants.LOG_DIR)
LOG_FILE = os.path.join(constants.LOG_DIR, 'yardstick.log')
-LOG_FORMATTER = ('%(asctime)s '
- '%(name)s %(filename)s:%(lineno)d '
- '%(levelname)s %(message)s')
+LOG_FORMATTER = '%(asctime)s [%(levelname)s] %(name)s %(filename)s:%(lineno)d %(message)s'
_LOG_FORMATTER = logging.Formatter(LOG_FORMATTER)
_LOG_STREAM_HDLR = logging.StreamHandler()
_LOG_FORMATTER = logging.Formatter(LOG_FORMATTER)
_LOG_STREAM_HDLR = logging.StreamHandler()