diff mbox

[Branch,~linaro-validation/lava-scheduler/trunk] Rev 19: give up on twistd

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

Commit Message

Michael-Doyle Hudson July 7, 2011, 9:59 a.m. UTC
------------------------------------------------------------
revno: 19
committer: Michael-Doyle Hudson <michael.hudson@linaro.org>
branch nick: trunk
timestamp: Thu 2011-07-07 21:45:09 +1200
message:
  give up on twistd
renamed:
  twisted/plugins/twistd_lava_scheduler_daemon.py => lava-scheduler*
modified:
  lava-scheduler*


--
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

=== renamed file 'twisted/plugins/twistd_lava_scheduler_daemon.py' => 'lava-scheduler' (properties changed: -x to +x)
--- twisted/plugins/twistd_lava_scheduler_daemon.py	2011-07-07 04:19:36 +0000
+++ lava-scheduler	2011-07-07 09:45:09 +0000
@@ -1,32 +1,23 @@ 
+#/usr/bin/python
+import logging
 import os
-
-from twisted.python import usage
-from twisted.plugin import IPlugin
-from twisted.application.service import IServiceMaker
-
-from zope.interface import implements
+import sys
+
+from twisted.internet import reactor
 
 from lava_scheduler_daemon.service import BoardSet
 
-class MyServiceMaker(object):
-    implements(IServiceMaker, IPlugin)
-    tapname = "lava-scheduler-daemon"
-    description = "Run the LAVA Scheduler Daemon"
-    options = usage.Options
-
-    def makeService(self, options):
-        """
-        Construct a TCPServer from a factory defined in myproject.
-        """
-        os.environ['DJANGO_SETTINGS_MODULE'] = 'lava_server.settings.development'
-        from lava_scheduler_daemon.dbjobsource import DatabaseJobSource
-        from twisted.internet import reactor
-        source = DatabaseJobSource()
-        return BoardSet(source, 'lava-dispatch', reactor)
-
-
-# Now construct an object which *provides* the relevant interfaces
-# The name of this variable is irrelevant, as long as there is *some*
-# name bound to a provider of IPlugin and IServiceMaker.
-
-serviceMaker = MyServiceMaker()
+os.environ['DJANGO_SETTINGS_MODULE'] = 'lava_server.settings.development'
+from lava_scheduler_daemon.dbjobsource import DatabaseJobSource
+
+source = DatabaseJobSource()
+service = BoardSet(source, 'lava-dispatch', reactor)
+reactor.callWhenRunning(service.startService)
+
+logger = logging.getLogger('')
+handler = logging.StreamHandler(sys.stdout)
+handler.setFormatter(logging.Formatter("[%(name)s] %(message)s"))
+logger.addHandler(handler)
+logger.setLevel(logging.DEBUG)
+
+reactor.run()