diff mbox

[Branch,~linaro-validation/lava-scheduler/trunk] Rev 10: maybe work on 2.6 now

Message ID 20110706220220.4756.30600.launchpad@loganberry.canonical.com
State Accepted
Headers show

Commit Message

Michael-Doyle Hudson July 6, 2011, 10:02 p.m. UTC
------------------------------------------------------------
revno: 10
committer: Michael-Doyle Hudson <michael.hudson@linaro.org>
branch nick: trunk
timestamp: Thu 2011-07-07 09:59:57 +1200
message:
  maybe work on 2.6 now
modified:
  lava_scheduler_daemon/board.py
  lava_scheduler_daemon/dbjobsource.py
  lava_scheduler_daemon/jobsource.py
  lava_scheduler_daemon/service.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_daemon/board.py'
--- lava_scheduler_daemon/board.py	2011-06-21 03:29:46 +0000
+++ lava_scheduler_daemon/board.py	2011-07-06 21:59:57 +0000
@@ -7,12 +7,10 @@ 
 from twisted.internet import defer
 
 
-logger = logging.getLogger(__name__)
-
 
 class DispatcherProcessProtocol(ProcessProtocol):
 
-    logger = logger.getChild('DispatcherProcessProtocol')
+    logger = logging.getLogger(__name__ + '.DispatcherProcessProtocol')
 
     def __init__(self, deferred):
         self.deferred = deferred
@@ -39,7 +37,7 @@ 
 
 class Job(object):
 
-    logger = logger.getChild('Job')
+    logger = logging.getLogger(__name__ + '.Job')
 
     def __init__(self, json_data, dispatcher, reactor):
         self.json_data = json_data
@@ -115,8 +113,6 @@ 
     not always do what you expect.  So don't mess around in that way please.
     """
 
-    logger = logger.getChild('Board')
-
     job_cls = Job
 
     def __init__(self, source, board_name, dispatcher, reactor, job_cls=None):
@@ -129,7 +125,7 @@ 
         self.running_job = None
         self._check_call = None
         self._stopping_deferreds = []
-        self.logger = self.logger.getChild(board_name)
+        self.logger = logging.getChild(__name__ + '.Board.' + board_name)
         self.checking = False
 
     def _state_name(self):

=== modified file 'lava_scheduler_daemon/dbjobsource.py'
--- lava_scheduler_daemon/dbjobsource.py	2011-06-23 02:57:31 +0000
+++ lava_scheduler_daemon/dbjobsource.py	2011-07-06 21:59:57 +0000
@@ -12,14 +12,12 @@ 
 from lava_scheduler_daemon.jobsource import IJobSource
 
 
-logger = logging.getLogger(__name__)
-
 
 class DatabaseJobSource(object):
 
     implements(IJobSource)
 
-    logger = logger.getChild('DatabaseJobSource')
+    logger = logging.getLogger(__name__ + '.DatabaseJobSource')
 
     def getBoardList_impl(self):
         return [d.hostname for d in Device.objects.all()]

=== modified file 'lava_scheduler_daemon/jobsource.py'
--- lava_scheduler_daemon/jobsource.py	2011-06-21 03:15:13 +0000
+++ lava_scheduler_daemon/jobsource.py	2011-07-06 21:59:57 +0000
@@ -30,7 +30,7 @@ 
 
     implements(IJobSource)
 
-    logger = logger.getChild('DirectoryJobSource')
+    logger = logging.getLogger(__name__ + '.DirectoryJobSource')
 
     def __init__(self, directory):
         self.directory = directory

=== modified file 'lava_scheduler_daemon/service.py'
--- lava_scheduler_daemon/service.py	2011-06-17 02:44:13 +0000
+++ lava_scheduler_daemon/service.py	2011-07-06 21:59:57 +0000
@@ -7,12 +7,9 @@ 
 from lava_scheduler_daemon.board import Board
 
 
-logger = logging.getLogger(__name__)
-
-
 class BoardSet(Service):
 
-    logger = logger.getChild('BoardSet')
+    logger = logging.getLogger(__name__ + '.BoardSet')
 
     def __init__(self, source, dispatcher, reactor):
         self.source = source