Twisted pidfile and other flag parameters simply do not function on Windows.

1 files changed, 16 insertions, 15 deletions

diff --git a/nova/twistd.py b/nova/twistd.py
index 9511c231c..29d753283 100644
--- a/nova/twistd.py
+++ b/nova/twistd.py
@@ -224,21 +224,22 @@ def serve(filename):
     logging.getLogger('amqplib').setLevel(logging.WARN)
     FLAGS.python = filename
     FLAGS.no_save = True
-    if not FLAGS.pidfile:
-        FLAGS.pidfile = '%s.pid' % name
-    elif FLAGS.pidfile.endswith('twistd.pid'):
-        FLAGS.pidfile = FLAGS.pidfile.replace('twistd.pid', '%s.pid' % name)
-    # NOTE(vish): if we're running nodaemon, redirect the log to stdout
-    if FLAGS.nodaemon and not FLAGS.logfile:
-        FLAGS.logfile = "-"
-    if not FLAGS.logfile:
-        FLAGS.logfile = '%s.log' % name
-    elif FLAGS.logfile.endswith('twistd.log'):
-        FLAGS.logfile = FLAGS.logfile.replace('twistd.log', '%s.log' % name)
-    if not FLAGS.prefix:
-        FLAGS.prefix = name
-    elif FLAGS.prefix.endswith('twisted'):
-        FLAGS.prefix = FLAGS.prefix.replace('twisted', name)
+    if sys.platform != 'win32':
+        if not FLAGS.pidfile:
+            FLAGS.pidfile = '%s.pid' % name
+        elif FLAGS.pidfile.endswith('twistd.pid'):
+            FLAGS.pidfile = FLAGS.pidfile.replace('twistd.pid', '%s.pid' % name)
+        # NOTE(vish): if we're running nodaemon, redirect the log to stdout
+        if FLAGS.nodaemon and not FLAGS.logfile:
+            FLAGS.logfile = "-"
+        if not FLAGS.logfile:
+            FLAGS.logfile = '%s.log' % name
+        elif FLAGS.logfile.endswith('twistd.log'):
+            FLAGS.logfile = FLAGS.logfile.replace('twistd.log', '%s.log' % name)
+        if not FLAGS.prefix:
+            FLAGS.prefix = name
+        elif FLAGS.prefix.endswith('twisted'):
+            FLAGS.prefix = FLAGS.prefix.replace('twisted', name)
 
     action = 'start'
     if len(argv) > 1: