Add option 'nodaemon' to buildslave start/restart.

buildbot · Apr 24, 2012 · cc02ed1 · cc02ed1
1 parent 6fd1097
commit cc02ed1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/slave/buildslave/scripts/runner.py b/slave/buildslave/scripts/runner.py
@@ -269,6 +269,7 @@ def postOptions(self):
 class StartOptions(MakerBase):
     optFlags = [
         ['quiet', 'q', "Don't display startup log messages"],
+        ['nodaemon', None, "Don't daemonize"],
         ]
     def getSynopsis(self):
         return "Usage:    buildslave start [<basedir>]"
@@ -280,6 +281,7 @@ def getSynopsis(self):
 class RestartOptions(MakerBase):
     optFlags = [
         ['quiet', 'q', "Don't display startup log messages"],
+        ['nodaemon', None, "Don't daemonize"],
         ]
     def getSynopsis(self):
         return "Usage:    buildslave restart [<basedir>]"

diff --git a/slave/buildslave/scripts/startup.py b/slave/buildslave/scripts/startup.py
@@ -109,6 +109,8 @@ def launch(config):
             "--no_save",
             "--logfile=twistd.log", # windows doesn't use the same default
             "--python=buildbot.tac"]
+    if config['nodaemon']:
+        argv.extend(['--nodaemon'])
     sys.argv = argv
 
     # this is copied from bin/twistd. twisted-2.0.0 through 2.4.0 use