Fix log yml for ztevnfmdriver

[vfc/nfvo/driver/vnfm/svnfm.git] / zte / vmanager / driver / settings.py

diff --git a/zte/vmanager/driver/settings.py b/zte/vmanager/driver/settings.py
index c9fe74c..ddc2a86 100644 (file)
--- a/zte/vmanager/driver/settings.py
+++ b/zte/vmanager/driver/settings.py
@@ -14,6 +14,10 @@
 
 import os
 import sys
+import platform
+from logging import config
+from onaplogging import monkey
+monkey.patch_all()
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 
@@ -43,6 +47,7 @@ INSTALLED_APPS = [
     'rest_framework',
     'driver.pub.database',
     'driver.interfaces',
+    'driver.swagger',
     'drf_yasg',
 ]
 
@@ -55,6 +60,7 @@ MIDDLEWARE_CLASSES = [
     'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'driver.middleware.LogContextMiddleware',
 ]
 
 ROOT_URLCONF = 'driver.urls'
@@ -111,40 +117,47 @@ TIME_ZONE = 'UTC'
 
 STATIC_URL = '/static/'
 
-LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': True,
-    'formatters': {
-        'standard': {
-            'format': '%(asctime)s:[%(name)s]:[%(filename)s]-[%(lineno)d] [%(levelname)s]:%(message)s',
+if platform.system() == 'Windows' or 'test' in sys.argv:
+    LOGGING = {
+        'version': 1,
+        'disable_existing_loggers': True,
+        'formatters': {
+            'standard': {
+                'format': '%(asctime)s:[%(name)s]:[%(filename)s]-[%(lineno)d] [%(levelname)s]:%(message)s',
+            },
         },
-    },
-    'filters': {
-    },
-    'handlers': {
-        'driver_handler': {
-            'level': 'DEBUG',
-            'class': 'logging.handlers.RotatingFileHandler',
-            'filename': os.path.join(
-                BASE_DIR,
-                'logs/runtime_driver.log'),
-            'formatter': 'standard',
-            'maxBytes': 1024 * 1024 * 50,
-            'backupCount': 5,
+        'filters': {
         },
-    },
-    'loggers': {
-        'driver': {
-            'handlers': ['driver_handler'],
-            'level': 'DEBUG',
-            'propagate': False},
-    }}
+        'handlers': {
+            'driver_handler': {
+                'level': 'DEBUG',
+                'class': 'logging.handlers.RotatingFileHandler',
+                'filename': os.path.join(
+                    BASE_DIR,
+                    'logs/runtime_driver.log'),
+                'formatter': 'standard',
+                'maxBytes': 1024 * 1024 * 50,
+                'backupCount': 5,
+            },
+        },
+        'loggers': {
+            'driver': {
+                'handlers': ['driver_handler'],
+                'level': 'DEBUG',
+                'propagate': False},
+        }}
+else:
+    LOGGING_CONFIG = None
+    # yaml configuration of logging
+    LOGGING_FILE = os.path.join(BASE_DIR, 'driver/log.yml')
+    config.yamlConfig(filepath=LOGGING_FILE, watchDog=True)
+
 
 if 'test' in sys.argv:
+
     from driver.pub.config import config
     config.REG_TO_MSB_WHEN_START = False
     REST_FRAMEWORK = {}
-    import platform
     if platform.system() == 'Linux':
         TEST_RUNNER = 'xmlrunner.extra.djangotestrunner.XMLTestRunner'
         TEST_OUTPUT_VERBOSE = True