diff mbox

[Branch,~linaro-validation/lava-scheduler/trunk] Rev 102: slightly tortuously propagate the logging config from scheduler to monitor

Message ID 20111201033612.3996.78144.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Michael-Doyle Hudson Dec. 1, 2011, 3:36 a.m. UTC 
------------------------------------------------------------
revno: 102
committer: Michael Hudson-Doyle <michael.hudson@linaro.org>
branch nick: lava-scheduler
timestamp: Thu 2011-12-01 16:32:52 +1300
message:
  slightly tortuously propagate the logging config from scheduler to monitor
modified:
  lava_scheduler_app/management/commands/schedulermonitor.py
  lava_scheduler_daemon/board.py


--
lp:lava-scheduler
https://code.launchpad.net/~linaro-validation/lava-scheduler/trunk

You are subscribed to branch lp:lava-scheduler.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-scheduler/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'lava_scheduler_app/management/commands/schedulermonitor.py'
--- lava_scheduler_app/management/commands/schedulermonitor.py	2011-12-01 03:03:31 +0000
+++ lava_scheduler_app/management/commands/schedulermonitor.py	2011-12-01 03:32:52 +0000
@@ -58,7 +58,7 @@ 
         else:
             handler = logging.FileHandler(logfile)
         handler.setFormatter(
-            logging.Formatter("[%(levelname)s] [%(name)s] %(message)s"))
+            logging.Formatter("M [%(levelname)s] [%(name)s] %(message)s"))
         logger.addHandler(handler)
         logger.setLevel(getattr(logging, loglevel.upper()))
 

=== modified file 'lava_scheduler_daemon/board.py'
--- lava_scheduler_daemon/board.py	2011-12-01 03:03:31 +0000
+++ lava_scheduler_daemon/board.py	2011-12-01 03:32:52 +0000
@@ -56,7 +56,6 @@ 
         self.log_file.flush()
 
     def processEnded(self, reason):
-        # This discards the process exit value.
         self.log_file.close()
         self.deferred.callback(None)
 
@@ -141,9 +140,15 @@ 
         fd, self._json_file = tempfile.mkstemp()
         with os.fdopen(fd, 'wb') as f:
             json.dump(json_data, f)
+        root_logger = logging.getLogger('')
+        root_level_name = logging._levelNames[root_logger.level]
+        root_handler = root_logger.handlers[0]
         args = [
             'setsid', 'lava-server', 'manage', 'schedulermonitor',
-            self.dispatcher, str(self.board_name), self._json_file]
+            self.dispatcher, str(self.board_name), self._json_file,
+            '-l', root_level_name]
+        if isinstance(root_handler, logging.FileHandler):
+            args.extend(['-f', root_handler.baseFilename])
         self.logger.info('executing "%s"', ' '.join(args))
         self.reactor.spawnProcess(
             SimplePP(d), 'setsid', childFDs={0:0, 1:1, 2:2},