Merge lp:~javier.collado/utah/bug1088376 into lp:utah

[Javier Collado]

This branch uses logging.handlers.TimedRotatingFileHandler for log server files
and grabs the values for the log rotation from the configuration file.

The default values are:
- rotate files every week on Monday
- keep 10 backup files at the most

[Andy Doan (doanac)]

review: Approve

[Max Brustkern (nuclearbob)]

Is there any way to also handle things like yaml files and preseeds, or should we setup a separate logrotate script for those?

[Javier Collado (javier.collado)]

@Max

I guess we could reuse the backup count logic in a logging handler to implement that behavior for yaml files and preseeds. However, that would look like a hack. Probably best way to address that would be to have our own class to handle the backup count for files with the same given prefix.

[Max Brustkern (nuclearbob)]

Okay. I think we can come back to that later, and this is worth getting in in the meantime.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-01 17:37:58 +0000
+++ debian/changelog	2013-05-01 19:18:29 +0000
@@ -16,6 +16,9 @@
   * Fixed help output to use just one runlist (LP: #1112597)
   * Setup rc.local to use output passed via command line (LP: #1155615)
 
+  [ Javier Collado ]
+  * Rotate server log files based on time (LP: #1088376)
+
  -- Max Brustkern <[e-mail]>  Fri, 26 Apr 2013 13:58:25 -0400
 
 utah (0.10ubuntu1) UNRELEASED; urgency=low

=== modified file 'utah/config.py'
--- utah/config.py	2013-04-04 14:55:25 +0000
+++ utah/config.py	2013-05-01 19:18:29 +0000
@@ -97,6 +97,11 @@
     kernel=None,
     # Default location of log directory
     logpath=os.path.join('/', 'var', 'log', 'utah'),
+    # Server files are rotated using logging.handlers.TimedRotatingLogHandler
+    # with the parameters below
+    logrotation_when='W0',
+    logrotation_interval=1,
+    logrotation_backupCount=10,
     # Default machine ID
     machineid=None,
     # Default machine type

=== modified file 'utah/run.py'
--- utah/run.py	2013-04-19 19:27:58 +0000
+++ utah/run.py	2013-05-01 19:18:29 +0000
@@ -18,6 +18,7 @@
 
 from argparse import ArgumentTypeError
 import logging
+from logging.handlers import TimedRotatingFileHandler
 import os
 import shutil
 import signal
@@ -449,7 +450,11 @@
     logger.addHandler(console_handler)
 
     # File logging
-    file_handler = logging.handlers.WatchedFileHandler(config.logfile)
+    file_handler = \
+        TimedRotatingFileHandler(config.logfile,
+                                 when=config.logrotation_when,
+                                 interval=config.logrotation_interval,
+                                 utc=True)
     file_handler.setFormatter(formatter)
     file_handler.setLevel(config.fileloglevel)
     logger.addHandler(file_handler)
@@ -457,13 +462,21 @@
     # Debug file logging
     if config.debuglog is not None:
         debug_file_handler = \
-            logging.handlers.WatchedFileHandler(config.debuglog)
+            TimedRotatingFileHandler(config.debuglog,
+                                     when=config.logrotation_when,
+                                     interval=config.logrotation_interval,
+                                     utc=True)
         debug_file_handler.setFormatter(formatter)
         debug_file_handler.setLevel(logging.DEBUG)
         logger.addHandler(debug_file_handler)
 
     # Configure ssh logging in a separate file
-    ssh_file_handler = logging.handlers.WatchedFileHandler(config.ssh_logfile)
+    ssh_file_handler = \
+        TimedRotatingFileHandler(config.ssh_logfile,
+                                 when=config.logrotation_when,
+                                 interval=config.logrotation_interval,
+                                 utc=True)
+
     ssh_file_handler.setFormatter(formatter)
     ssh_file_handler.setLevel(logging.DEBUG)