X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=VNFs%2FDPPD-PROX%2Fhelper-scripts%2Frapid%2Frapid_log.py;h=1ad5427389e1e49415ba420f800350363c81020e;hb=ef3d8d2223899f70d93be3ffa5ff14e7ad2d421f;hp=d1460f55a7ff90772f93f478e5705c0b5954d2a1;hpb=5de20bff8792a736dabf5e48be8e14154ab4f7cc;p=samplevnf.git

diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_log.py b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_log.py
index d1460f55..1ad54273 100644
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_log.py
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_log.py
@@ -42,56 +42,67 @@ class RapidLog(object):
 
     @staticmethod
     def log_init(log_file, loglevel, screenloglevel, version):
-        # create formatters
-        screen_formatter = logging.Formatter("%(message)s")
-        file_formatter = logging.Formatter("%(asctime)s - %(levelname)s - %(message)s")
-
-        # get a top-level logger,
-        # set its log level,
-        # BUT PREVENT IT from propagating messages to the root logger
-        #
-        log = logging.getLogger()
-        numeric_level = getattr(logging, loglevel.upper(), None)
-        if not isinstance(numeric_level, int):
-            raise ValueError('Invalid log level: %s' % loglevel)
-        log.setLevel(numeric_level)
-        log.propagate = 0
-
-        # create a console handler
-        # and set its log level to the command-line option 
-        # 
-        console_handler = logging.StreamHandler(sys.stdout)
-        #console_handler.setLevel(logging.INFO)
-        numeric_screenlevel = getattr(logging, screenloglevel.upper(), None)
-        if not isinstance(numeric_screenlevel, int):
-            raise ValueError('Invalid screenlog level: %s' % screenloglevel)
-        console_handler.setLevel(numeric_screenlevel)
-        console_handler.setFormatter(screen_formatter)
-
-        # create a file handler
-        # and set its log level
-        #
-        file_handler = logging.handlers.RotatingFileHandler(log_file, backupCount=10)
-        #file_handler = log.handlers.TimedRotatingFileHandler(log_file, 'D', 1, 5)
-        file_handler.setLevel(numeric_level)
-        file_handler.setFormatter(file_formatter)
-
-        # add handlers to the logger
-        #
-        log.addHandler(file_handler)
-        log.addHandler(console_handler)
-
-        # Check if log exists and should therefore be rolled
-        needRoll = os.path.isfile(log_file)
-
-
-        # This is a stale log, so roll it
-        if needRoll:    
-            # Add timestamp
-            log.debug('\n---------\nLog closed on %s.\n---------\n' % time.asctime())
-
-            # Roll over on application start
-            file_handler.doRollover()
+        log = logging.getLogger(__name__)
+        makeFileHandler = True
+        makeStreamHandler = True
+        if len(log.handlers) > 0:
+            for handler in log.handlers:
+                if isinstance(handler, logging.FileHandler):
+                    makeFileHandler = False
+                elif isinstance(handler, logging.StreamHandler):
+                    makeStreamHandler = False
+        if makeStreamHandler:
+            # create formatters
+            screen_formatter = logging.Formatter("%(message)s")
+            # create a console handler
+            # and set its log level to the command-line option 
+            # 
+            console_handler = logging.StreamHandler(sys.stdout)
+            #console_handler.setLevel(logging.INFO)
+            numeric_screenlevel = getattr(logging, screenloglevel.upper(), None)
+            if not isinstance(numeric_screenlevel, int):
+                raise ValueError('Invalid screenlog level: %s' % screenloglevel)
+            console_handler.setLevel(numeric_screenlevel)
+            console_handler.setFormatter(screen_formatter)
+            # add handler to the logger
+            #
+            log.addHandler(console_handler)
+        if makeFileHandler:
+            # create formatters
+            file_formatter = logging.Formatter("%(asctime)s - %(levelname)s - %(message)s")
+            # get a top-level logger,
+            # set its log level,
+            # BUT PREVENT IT from propagating messages to the root logger
+            #
+            numeric_level = getattr(logging, loglevel.upper(), None)
+            if not isinstance(numeric_level, int):
+                raise ValueError('Invalid log level: %s' % loglevel)
+            log.setLevel(numeric_level)
+            log.propagate = 0
+
+
+            # create a file handler
+            # and set its log level
+            #
+            file_handler = logging.handlers.RotatingFileHandler(log_file, backupCount=10)
+            file_handler.setLevel(numeric_level)
+            file_handler.setFormatter(file_formatter)
+
+            # add handler to the logger
+            #
+            log.addHandler(file_handler)
+
+            # Check if log exists and should therefore be rolled
+            needRoll = os.path.isfile(log_file)
+
+
+            # This is a stale log, so roll it
+            if needRoll:    
+                # Add timestamp
+                log.debug('\n---------\nLog closed on %s.\n---------\n' % time.asctime())
+
+                # Roll over on application start
+                file_handler.doRollover()
 
         # Add timestamp
         log.debug('\n---------\nLog started on %s.\n---------\n' % time.asctime())
@@ -99,14 +110,22 @@ class RapidLog(object):
         log.debug("rapid version: " + version)
         RapidLog.log = log
 
+    @staticmethod
+    def log_close():
+        for handler in RapidLog.log.handlers:
+            if isinstance(handler, logging.FileHandler):
+                handler.close()
+                RapidLog.log.removeHandler(handler)
+
     @staticmethod
     def exception(exception_info):
         RapidLog.log.exception(exception_info)
-        raise Exception(exception_info)
+        exit(1)
 
+    @staticmethod
     def critical(critical_info):
         RapidLog.log.critical(critical_info)
-        raise Exception(critical_info)
+        exit(1)
 
     @staticmethod
     def error(error_info):