From 3c2113d24eb24e05b9e2f88d3c127af7b157d7bd Mon Sep 17 00:00:00 2001
From: "ying.yunlong" <ying.yunlong@zte.com.cn>
Date: Sat, 4 Aug 2018 15:34:29 +0800
Subject: [PATCH] Fix log error when run vnfres tests in windows

It occurs error when run unit tests in windows environment.

Change-Id: I2326c28dfeae4ee3ba62f4de59b26ee1cf79ed90
Issue-ID: VFC-1014
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
---
 res/res/settings.py | 74 ++++++++++++++++++++++++++---------------------------
 1 file changed, 36 insertions(+), 38 deletions(-)

diff --git a/res/res/settings.py b/res/res/settings.py
index 98ec46a..8884481 100644
--- a/res/res/settings.py
+++ b/res/res/settings.py
@@ -14,6 +14,7 @@
 
 import os
 import sys
+import platform
 
 import redisco
 
@@ -123,47 +124,44 @@ TIME_ZONE = 'UTC'
 # https://docs.djangoproject.com/en/1.6/howto/static-files/
 
 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',
-#         },
-#     },
-#     'filters': {
-#     },
-#     'handlers': {
-#         'res_handler': {
-#             'level': 'DEBUG',
-#             'class': 'logging.handlers.RotatingFileHandler',
-#             'filename': os.path.join(BASE_DIR, 'logs/runtime_res.log'),
-#             'formatter': 'standard',
-#             'maxBytes': 1024 * 1024 * 50,
-#             'backupCount': 5,
-#         },
-#     },
-#
-#     'loggers': {
-#         'res': {
-#             'handlers': ['res_handler'],
-#             'level': 'DEBUG',
-#             'propagate': False
-#         },
-#     }
-# }
-LOGGING_CONFIG = None
-# yaml configuration of logging
-LOGGING_FILE = os.path.join(BASE_DIR, 'res/log.yml')
-if 'test' in sys.argv:
-    os.system('sed -i "s|/var/log/onap/vfc/gvnfm-vnfres|/tmp|" %s' % LOGGING_FILE)
-config.yamlConfig(filepath=LOGGING_FILE, watchDog=True)
 
+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': {
+            'res_handler': {
+                'level': 'DEBUG',
+                'class': 'logging.handlers.RotatingFileHandler',
+                'filename': os.path.join(BASE_DIR, 'logs/runtime_res.log'),
+                'formatter': 'standard',
+                'maxBytes': 1024 * 1024 * 50,
+                'backupCount': 5,
+            },
+        },
+
+        'loggers': {
+            'res': {
+                'handlers': ['res_handler'],
+                'level': 'DEBUG',
+                'propagate': False
+            },
+        }
+    }
+else:
+    LOGGING_CONFIG = None
+    LOGGING_FILE = os.path.join(BASE_DIR, 'res/log.yml')
+    config.yamlConfig(filepath=LOGGING_FILE, watchDog=True)
 
-if 'test' in sys.argv:
-    os.system('sed -i "s|/tmp|/var/log/onap/vfc/gvnfm-vnfres|" %s' % LOGGING_FILE)
 
+if 'test' in sys.argv:
     from res.pub.config import config
     config.REG_TO_MSB_WHEN_START = False
     DATABASES = {}
-- 
2.16.6