From patchwork Wed Jul 6 22:02:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael-Doyle Hudson X-Patchwork-Id: 2511 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 4A99924145 for ; Wed, 6 Jul 2011 22:02:24 +0000 (UTC) Received: from mail-qy0-f173.google.com (mail-qy0-f173.google.com [209.85.216.173]) by fiordland.canonical.com (Postfix) with ESMTP id F0D58A186E0 for ; Wed, 6 Jul 2011 22:02:23 +0000 (UTC) Received: by qyk10 with SMTP id 10so2778687qyk.11 for ; Wed, 06 Jul 2011 15:02:23 -0700 (PDT) Received: by 10.229.62.194 with SMTP id y2mr89206qch.4.1309989743320; Wed, 06 Jul 2011 15:02:23 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.229.48.135 with SMTP id r7cs91784qcf; Wed, 6 Jul 2011 15:02:22 -0700 (PDT) Received: by 10.216.237.8 with SMTP id x8mr6274991weq.37.1309989741530; Wed, 06 Jul 2011 15:02:21 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id o80si17557357weq.34.2011.07.06.15.02.21; Wed, 06 Jul 2011 15:02:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) client-ip=91.189.90.139; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) smtp.mail=bounces@canonical.com Received: from loganberry.canonical.com ([91.189.90.37]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1QeaAm-00088y-ML for ; Wed, 06 Jul 2011 22:02:20 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id A59352E84F6 for ; Wed, 6 Jul 2011 22:02:20 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-scheduler X-Launchpad-Branch: ~linaro-validation/lava-scheduler/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 10 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-scheduler/trunk] Rev 10: maybe work on 2.6 now Message-Id: <20110706220220.4756.30600.launchpad@loganberry.canonical.com> Date: Wed, 06 Jul 2011 22:02:20 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13376"; Instance="initZopeless config overlay" X-Launchpad-Hash: 81c10d5628a347e324b212bb324d4484f87fc4cf ------------------------------------------------------------ revno: 10 committer: Michael-Doyle Hudson 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 === 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