Skip to content

Commit f0f4b86

Browse files
author
Alexander Smishlajev
committed
describe -t option in help; remove unused win32 imports
1 parent 998279a commit f0f4b86

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

roundup/scripts/roundup_server.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
"""Command-line script that runs a server over roundup.cgi.client.
1919
20-
$Id: roundup_server.py,v 1.70 2004-10-30 08:23:51 a1s Exp $
20+
$Id: roundup_server.py,v 1.71 2004-10-30 08:43:06 a1s Exp $
2121
"""
2222
__docformat__ = 'restructuredtext'
2323

@@ -422,8 +422,6 @@ class ThreadingServer(SocketServer.ThreadingMixIn,
422422

423423
# allow the win32
424424
import win32service
425-
import win32event
426-
import win32file
427425

428426
class SvcShutdown(Exception):
429427
pass
@@ -486,7 +484,6 @@ def usage(message=''):
486484
-d <PIDfile> run the server in the background and write the server's PID
487485
to the file indicated by PIDfile. The -l option *must* be
488486
specified if -d is used.'''
489-
port=DEFAULT_PORT
490487
if message:
491488
message += '\n'
492489
print _('''%(message)sUsage: roundup-server [options] [name=tracker home]*
@@ -500,6 +497,8 @@ def usage(message=''):
500497
-p <port> set the port to listen on (default: %(port)s)
501498
-l <fname> log to the file indicated by fname instead of stderr/stdout
502499
-N log client machine names instead of IP addresses (much slower)
500+
-t <mode> multiprocess mode (default: %(mp_def)s).
501+
Allowed values: %(mp_types)s.
503502
%(os_part)s
504503
505504
Long options:
@@ -536,8 +535,13 @@ def usage(message=''):
536535
"roundup-admin init". You may specify any number of these name=home
537536
pairs on the command-line. Make sure the name part doesn't include
538537
any url-unsafe characters like spaces, as these confuse IE.
539-
''')%locals()
540-
#sys.exit(0)
538+
''') % {
539+
"message": message,
540+
"os_part": os_part,
541+
"port": DEFAULT_PORT,
542+
"mp_def": DEFAULT_MULTIPROCESS,
543+
"mp_types": ", ".join(MULTIPROCESS_TYPES),
544+
}
541545

542546

543547
def daemonize(pidfile):

0 commit comments

Comments
 (0)