Added date to filename for MyTimedRotatingFileHandler if it doesn't have

it

src/python/WMCore/REST/Main.py

@@ -36,9 +36,8 @@
 from cherrypy.lib import profiler
 
 ### Tools is needed for CRABServer startup: it sets up the tools attributes
-import WMCore.REST.Tools
 from WMCore.Configuration import ConfigSection, loadConfigurationFile
-from WMCore.WMLogging import getTimeRotatingLogger, MyTimedRotatingFileHandler
+from WMCore.WMLogging import getTimeRotatingLogger
 from Utils.Utilities import lowerCmsHeaders
 from Utils.PythonVersion import PY2
 

src/python/WMCore/WMLogging.py

@@ -8,6 +8,7 @@
 import codecs
 from datetime import date, timedelta
 from logging.handlers import HTTPHandler, RotatingFileHandler, TimedRotatingFileHandler
+from pathlib import Path
 
 # a new log level which is lower than debug
 # to prevent a tsunami of log messages in debug
@@ -23,6 +24,7 @@ def sqldebug(msg):
     """
     logging.log(logging.SQLDEBUG, msg)
 
+
 def setupRotatingHandler(fileName, maxBytes = 200000000, backupCount = 3):
     """
     _setupRotatingHandler_
@@ -35,7 +37,8 @@ def setupRotatingHandler(fileName, maxBytes = 200000000, backupCount = 3):
 
 
 def getTimeRotatingLogger(name, logFile, duration = 'midnight'):
-    """ Set the logger for time based lotaing.
+    """
+    Set the logger for time based rotating.
     """
     logger = logging.getLogger(name)
     if duration == 'midnight':
@@ -62,7 +65,18 @@ class MyTimedRotatingFileHandler(TimedRotatingFileHandler):
     https://stackoverflow.com/questions/338450/timedrotatingfilehandler-changing-file-name
     """
     def __init__(self, logName, interval, backupCount):
-        super(MyTimedRotatingFileHandler, self).__init__(logName, when=interval,
+        """
+        Initializes MyTimedRotatingFileHandler
+
+        If logName doesn't contain a date, the day of runtime will be added
+        """
+        logPath = Path(logName)
+        todayStr = date.today().strftime("%Y%m%d")
+
+        if todayStr not in logName:
+            logPath = logPath.parent.joinpath(f"{logPath.stem}-{todayStr}{logPath.suffix}")
+
+        super(MyTimedRotatingFileHandler, self).__init__(logPath, when=interval,
                                                          backupCount=backupCount)
 
     def doRollover(self):
@@ -71,7 +85,7 @@ def doRollover(self):
 
         Rotate the log file and add the date between the log name
         and its extension, e.g.:
-        reqmgr2.log becomes reqmgr2-20170815.log
+        reqmgr2-20170814.log becomes reqmgr2-20170815.log
         """
         self.stream.close()
         # replace yesterday's date by today