Modify logger

.gitignore

@@ -2,6 +2,7 @@
 config.ini
 config.json
 *.log
+logs
 
 # Python
 __pycache__

requirements.txt

@@ -1 +1 @@
-requests==2.23.0
+requests==2.24.0

tests.py

@@ -0,0 +1,19 @@
+from __future__ import absolute_import, print_function
+
+import unittest
+
+
+class MyTestCase(unittest.TestCase):
+    def test_something(self):
+        from util import get_logger
+        import time
+        logger = get_logger('S', interval=3, backup_count=3)
+
+        for i in range(9):
+            logger.info(i)
+            time.sleep(1)
+        self.assertEqual(True, False)
+
+
+if __name__ == '__main__':
+    unittest.main()

util/util.py

@@ -54,44 +54,44 @@ def get_config_file_path(config_file_name: str = 'config.json', absolute: bool =
     return os.path.join(os.getcwd(), config_file_name)
 
 
-def get_logger(when: str = 'D') -> logging.Logger:
-    """
-    Get logger
-    :param when:
-        Calculate the real rollover interval, which is just the number of
-        seconds between rollovers.  Also set the filename suffix used when
-        a rollover occurs.  Current 'when' events supported:
-        S - Seconds
-        M - Minutes
-        H - Hours
-        D - Days
-
-        Case of the 'when' specifier is not important; lower or upper case
-        will work.
-    :return:
+def get_logger(when: str = 'D', interval: int = 1, backup_count: int = 3) -> logging.Logger:
     """
+        Get logger
+        :param when:
+            Calculate the real rollover interval, which is just the number of
+            seconds between rollovers.  Also set the filename suffix used when
+            a rollover occurs.  Current 'when' events supported:
+            S - Seconds
+            M - Minutes
+            H - Hours
+            D - Days
+
+            Case of the 'when' specifier is not important; lower or upper case
+            will work.
+        :param interval:
+        :param backup_count:
+        :return:
+        """
     log_dir = 'logs'
     if not os.path.isdir(log_dir):
         os.makedirs(log_dir)
 
-    logging.basicConfig()
+    formatter = logging.Formatter('%(asctime)s\t%(filename)s:%(lineno)s\t[%(levelname)-6s]\t%(message)s', datefmt='%Y-%m-%d %H:%M:%S')
 
-    logger = logging.getLogger('UPCNet')
-    logger.setLevel(logging.INFO)
     timed_rotating_file_handler = TimedRotatingFileHandler(
         filename=os.path.join(log_dir, 'app.log'),
         when=when,
-        interval=1,
-        backupCount=3,
+        interval=interval,
+        backupCount=backup_count,
     )
 
-    # if when.upper() == 'D':
-    #     timed_rotating_file_handler.suffix = "%Y-%m-%d.log"
-    # else:
-    #     timed_rotating_file_handler.suffix = "%Y-%m-%d_%H:%M:%S.log"
-
-    formatter = logging.Formatter('%(asctime)s [%(levelname)-6s]: %(message)s', datefmt='%Y-%m-%d %H:%M:%S')
     timed_rotating_file_handler.setFormatter(formatter)
+
+    logging.basicConfig()
+
+    logger = logging.getLogger('UPCNet')
+    logger.setLevel(logging.INFO)
+
     logger.addHandler(timed_rotating_file_handler)
 
     return logger