X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=yardstick%2F__init__.py;h=9eb5db9b16b2654336dcb20792c7746f75b8eb6a;hb=81d5aeed3d8ea802c1d5ba3944a70d2d8df3a469;hp=2f5ae9febad5588222d87177b406521f7c39e238;hpb=b74d875134b988a26441d559a9e700aaa68d6a0c;p=yardstick.git

diff --git a/yardstick/__init__.py b/yardstick/__init__.py
index 2f5ae9feb..9eb5db9b1 100644
--- a/yardstick/__init__.py
+++ b/yardstick/__init__.py
@@ -10,21 +10,25 @@
 from __future__ import absolute_import
 import logging
 import os
-import sys
+import errno
 
-import yardstick.vTC.apexlake as apexlake
+# this module must only import other modules that do
+# not require loggers to be created, so this cannot
 from yardstick.common import constants
-from yardstick.common import utils as yardstick_utils
+from yardstick.common import exceptions
 
-# 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)
+try:
+    # do not use yardstick.common.utils.makedirs
+    # since yardstick.common.utils creates a logger
+    # and so it cannot be imported before this code
+    os.makedirs(constants.LOG_DIR)
+except OSError as e:
+    if e.errno != errno.EEXIST:
+        raise
+
 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()
@@ -42,6 +46,7 @@ def _init_logging():
         _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)
     _LOG_FILE_HDLR.setLevel(logging.DEBUG)