changeset 4368:b88903618c75

merged moin/1.7
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sat, 04 Oct 2008 21:22:42 +0200
parents 5237eb242765 (current diff) 8bcdfd815639 (diff)
children 8d00af5e09c2
files
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/script/server/standalone.py	Sat Oct 04 16:46:50 2008 +0200
+++ b/MoinMoin/script/server/standalone.py	Sat Oct 04 21:22:42 2008 +0200
@@ -115,7 +115,7 @@
                 Config.group = self.options.group
             if self.options.port:
                 Config.port = self.options.port
-            if self.options.interface:
+            if hasattr(self.options, 'interface'): # needs to work for "" value also
                 Config.interface = self.options.interface
             if serverClass:
                 Config.serverClass = serverClass + 'Server'
@@ -141,3 +141,4 @@
     serverClass = 'ThreadPoolServer'
     threadLimit = 10
     requestQueueSize = 50
+
--- a/wiki/server/mointwisted	Sat Oct 04 16:46:50 2008 +0200
+++ b/wiki/server/mointwisted	Sat Oct 04 21:22:42 2008 +0200
@@ -33,6 +33,9 @@
 from MoinMoin.server import daemon
 from mointwisted import Config
 
+# PID file location, please use some appropriate full path (needs to be writable):
+pidFile = './%s.pid' % Config.name
+
 
 class TwistedScript(daemon.DaemonScript):
 
@@ -41,6 +44,6 @@
         os.system('twistd --python mointwisted.py --pidfile %s' % self.pidFile)
 
 
-script = TwistedScript(Config.name, None)
+script = TwistedScript(Config.name, pidFile, None)
 script.run()