Round up all options and clean up unused ones.

sample.conf

@@ -1,23 +1,23 @@
 [supervisord]
-xmlrpc_port=127.0.0.1:9001  ; (default is to run no xmlrpc server)
-exitcodes=0,2               ; (default 0,2)
-umask=022                   ; (default 022)
-logfile=supervisord.log     ; (default $CWD/supervisord.log)
-logfile_maxbytes=50MB       ; (default 50MB)
-logfile_backups=10          ; (default 10)
-loglevel=info               ; (default info)
-pidfile=supervisord.pid     ; (default $CWD/supervisord.pid)
-nodaemon=false              ; (default false)
-identifier=supervisor       ; (default supervisor)
-minfds=1024                 ; (default 1024)
-minprocs=200                ; (default 200)
-backofflimit=3              ; (default 3)
+xmlrpc_port=127.0.0.1:9001  ; (http port;default is to run no xmlrpc server)
+exitcodes=0,2               ; ('expected' exit codes;default 0,2)
+umask=022                   ; (process umask;default 022)
+logfile=supervisord.log     ; (main log file;default $CWD/supervisord.log)
+logfile_maxbytes=50MB       ; (max main logfile bytes b4 rotation;default 50MB)
+logfile_backups=10          ; (num of main logfile rotation backups;default 10)
+loglevel=info               ; (logging level;default info; others: debug,warn)
+pidfile=supervisord.pid     ; (supervisord pidfile;default $CWD/supervisord.pid)
+nodaemon=false              ; (start in foreground if true;default false)
+identifier=supervisor       ; (internal identifier;default "supervisor")
+minfds=1024                 ; (min. avail startup file descriptors;default 1024)
+minprocs=200                ; (min. avail process descriptors;default 200)
+backofflimit=3              ; (child process restart seconds;default 3)
 
 ;nocleanup=true              ; (don't clean up tempfiles at start;default false)
 ;forever=false               ; (keep restarting processes forever;default false)
 ;xmlrpc_username=user        ; (default is no username (open system))
 ;xmlrpc_password=123         ; (default is no password (open system))
-;childlogdir=/tmp            ; (default $TEMP)
+;childlogdir=/tmp            ; ('AUTO' child log dir, default $TEMP)
 ;user=nobody                 ; (default is current user, required if root)
 ;directory=/tmp              ; (default is not to cd during start)
 
@@ -25,6 +25,17 @@ backofflimit=3              ; (default 3)
 serverurl=http://127.0.0.1:9001
 ;username=chris              ; should be same as xmlrpc_username if set
 ;password=123                ; should be same as xmlrpc_password if set
+;prompt=mysupervisor         ; cmd line prompt (default "supervisor")
+
+;[program:theprogramname]
+;command=/bin/cat            ; the program (relative uses PATH, can take args)
+;autostart=true              ; start at supervisord start (default: true)
+;autorestart=true            ; retstart at unexpected quit (default: true)
+;user=chrism                 ; setuid to this user account to run the program
+;logfile=/var/log/cat.log    ; child log path, use NONE for none; default AUTO
+;logfile_backups=2           ; # of logfile backups if autorotating (default 1)
+;logfile_maxbytes=1MB        ; max # logfile bytes before rotation (default 5MB)
+;stopsignal=QUIT             ; signal used to kill process (default TERM)
 
 [program:cat]
 command=/bin/cat

src/supervisor/http.py

@@ -461,7 +461,7 @@ def makeHTTPServer(supervisord):
         def log(self, msg):
             if msg.endswith('\n'):
                 msg = msg[:-1]
-            options.logger.info(msg)
+            options.logger.debug(msg)
     wrapper = LogWrapper()
     hs = supervisor_http_server(host, port, logger_object=wrapper,
                                 username=username, password=password)

src/supervisor/options.py

@@ -455,7 +455,6 @@ class ServerOptions(Options):
     pidfile = None
     passwdfile = None
     nodaemon = None
-    prompt = None
     AUTOMATIC = []
     
     def __init__(self):
@@ -546,9 +545,6 @@ class ServerOptions(Options):
         if not self.loglevel:
             self.loglevel = self.configroot.supervisord.loglevel
 
-        if not self.prompt:
-            self.prompt = self.configroot.supervisord.prompt
-
         if not self.pidfile:
             self.pidfile = os.path.abspath(self.configroot.supervisord.pidfile)
         else:
@@ -609,9 +605,6 @@ class ServerOptions(Options):
         umask = datatypes.octal_type(config.getdefault('umask', '022'))
         section.umask = umask
 
-        prompt = config.getdefault('prompt', 'supervisor')
-        section.prompt = prompt
-
         logfile = config.getdefault('logfile', 'supervisord.log')
         logfile = datatypes.existing_dirpath(logfile)
         section.logfile = logfile
@@ -632,9 +625,6 @@ class ServerOptions(Options):
         pidfile = datatypes.existing_dirpath(pidfile)
         section.pidfile = pidfile
 
-        section.noauth = True # no SRP auth here
-        section.passwdfile = None # no SRP auth here
-
         identifier = config.getdefault('identifier', 'supervisor')
         section.identifier = identifier
 
@@ -692,10 +682,10 @@ class ServerOptions(Options):
             logfile = config.saneget(section, 'logfile', None)
             if logfile in ('NONE', 'OFF'):
                 logfile = None
-            elif logfile is not None:
-                logfile = datatypes.existing_dirpath(logfile)
-            else:
+            elif logfile in (None, 'AUTO'):
                 logfile = self.AUTOMATIC
+            else:
+                logfile = datatypes.existing_dirpath(logfile)
             logfile_backups = config.saneget(section, 'logfile_backups', 1)
             logfile_backups = datatypes.integer(logfile_backups)
             logfile_maxbytes = config.saneget(section, 'logfile_maxbytes',

src/supervisor/tests.py

@@ -89,15 +89,12 @@ command=/bin/cat
         self.assertEqual(options.forever, False)
         self.assertEqual(options.exitcodes, [0,1])
         self.assertEqual(options.umask, 022)
-        self.assertEqual(options.prompt, 'supervisor')
         self.assertEqual(options.logfile, 'supervisord.log')
         self.assertEqual(options.logfile_maxbytes, 1000 * 1024 * 1024)
         self.assertEqual(options.logfile_backups, 5)
         self.assertEqual(options.loglevel, 40)
         self.assertEqual(options.pidfile, 'supervisord.pid')
         self.assertEqual(options.nodaemon, True)
-        self.assertEqual(options.passwdfile, None)
-        self.assertEqual(options.noauth, True)
         self.assertEqual(options.identifier, 'fleeb')
         self.assertEqual(options.childlogdir, tempfile.gettempdir())
         self.assertEqual(options.xmlrpc_port.family, socket.AF_INET)
@@ -155,7 +152,6 @@ command=/bin/cat
         self.assertEqual(instance.forever, False)
         self.assertEqual(instance.exitcodes, [0,1])
         self.assertEqual(instance.umask, 022)
-        self.assertEqual(instance.prompt, 'supervisor')
         self.assertEqual(instance.logfile, os.path.join(here,'supervisord.log'))
         self.assertEqual(instance.logfile_maxbytes, 1000 * 1024 * 1024)
         self.assertEqual(instance.logfile_backups, 5)