Ver código fonte

Update fcgi-program and eventlistener examples. Closes #535

Mike Naberezny 10 anos atrás
pai
commit
dc69227a54
2 arquivos alterados com 25 adições e 5 exclusões
  1. 24 4
      docs/configuration.rst
  2. 1 1
      supervisor/skel/sample.conf

+ 24 - 4
docs/configuration.rst

@@ -1027,22 +1027,26 @@ where specified.
    umask=022
    umask=022
    priority=999
    priority=999
    autostart=true
    autostart=true
-   autorestart=true
+   autorestart=unexpected
    startsecs=10
    startsecs=10
    startretries=3
    startretries=3
    exitcodes=0,2
    exitcodes=0,2
    stopsignal=TERM
    stopsignal=TERM
    stopwaitsecs=10
    stopwaitsecs=10
+   stopasgroup=false
+   killasgroup=false
    user=chrism
    user=chrism
    redirect_stderr=false
    redirect_stderr=false
    stdout_logfile=/a/path
    stdout_logfile=/a/path
    stdout_logfile_maxbytes=1MB
    stdout_logfile_maxbytes=1MB
    stdout_logfile_backups=10
    stdout_logfile_backups=10
    stdout_capture_maxbytes=1MB
    stdout_capture_maxbytes=1MB
+   stdout_events_enabled=false
    stderr_logfile=/a/path
    stderr_logfile=/a/path
    stderr_logfile_maxbytes=1MB
    stderr_logfile_maxbytes=1MB
    stderr_logfile_backups=10
    stderr_logfile_backups=10
    stderr_capture_maxbytes=1MB
    stderr_capture_maxbytes=1MB
+   stderr_events_enabled=false
    environment=A="1",B="2"
    environment=A="1",B="2"
    serverurl=AUTO
    serverurl=AUTO
 
 
@@ -1261,8 +1265,12 @@ above constraints and additions.
    [fcgi-program:fcgiprogramname]
    [fcgi-program:fcgiprogramname]
    command=/usr/bin/example.fcgi
    command=/usr/bin/example.fcgi
    socket=unix:///var/run/supervisor/%(program_name)s.sock
    socket=unix:///var/run/supervisor/%(program_name)s.sock
+   socket_owner=chrism
+   socket_mode=0700
    process_name=%(program_name)s_%(process_num)02d
    process_name=%(program_name)s_%(process_num)02d
    numprocs=5
    numprocs=5
+   directory=/tmp
+   umask=022
    priority=999
    priority=999
    autostart=true
    autostart=true
    autorestart=unexpected
    autorestart=unexpected
@@ -1270,16 +1278,21 @@ above constraints and additions.
    startretries=3
    startretries=3
    exitcodes=0,2
    exitcodes=0,2
    stopsignal=QUIT
    stopsignal=QUIT
+   stopasgroup=false
+   killasgroup=false
    stopwaitsecs=10
    stopwaitsecs=10
    user=chrism
    user=chrism
    redirect_stderr=true
    redirect_stderr=true
    stdout_logfile=/a/path
    stdout_logfile=/a/path
    stdout_logfile_maxbytes=1MB
    stdout_logfile_maxbytes=1MB
    stdout_logfile_backups=10
    stdout_logfile_backups=10
+   stdout_events_enabled=false
    stderr_logfile=/a/path
    stderr_logfile=/a/path
    stderr_logfile_maxbytes=1MB
    stderr_logfile_maxbytes=1MB
-   stderr_logfile_backups
+   stderr_logfile_backups=10
+   stderr_events_enabled=false
    environment=A="1",B="2"
    environment=A="1",B="2"
+   serverurl=AUTO
 
 
 ``[eventlistener:x]`` Section Settings
 ``[eventlistener:x]`` Section Settings
 --------------------------------------
 --------------------------------------
@@ -1339,6 +1352,8 @@ above constraints and additions.
    numprocs=5
    numprocs=5
    events=PROCESS_STATE
    events=PROCESS_STATE
    buffer_size=10
    buffer_size=10
+   directory=/tmp
+   umask=022
    priority=-1
    priority=-1
    autostart=true
    autostart=true
    autorestart=unexpected
    autorestart=unexpected
@@ -1347,15 +1362,20 @@ above constraints and additions.
    exitcodes=0,2
    exitcodes=0,2
    stopsignal=QUIT
    stopsignal=QUIT
    stopwaitsecs=10
    stopwaitsecs=10
+   stopasgroup=false
+   killasgroup=false
    user=chrism
    user=chrism
    redirect_stderr=false
    redirect_stderr=false
    stdout_logfile=/a/path
    stdout_logfile=/a/path
    stdout_logfile_maxbytes=1MB
    stdout_logfile_maxbytes=1MB
    stdout_logfile_backups=10
    stdout_logfile_backups=10
+   stdout_events_enabled=false
    stderr_logfile=/a/path
    stderr_logfile=/a/path
    stderr_logfile_maxbytes=1MB
    stderr_logfile_maxbytes=1MB
-   stderr_logfile_backups
+   stderr_logfile_backups=10
+   stderr_events_enabled=false
    environment=A="1",B="2"
    environment=A="1",B="2"
+   serverurl=AUTO
 
 
 ``[rpcinterface:x]`` Section Settings
 ``[rpcinterface:x]`` Section Settings
 -------------------------------------
 -------------------------------------
@@ -1482,7 +1502,7 @@ An example configuration snippet with customizable values:
    umask=022
    umask=022
    priority=999
    priority=999
    autostart=true
    autostart=true
-   autorestart=true
+   autorestart=unexpected
    exitcodes=0,2
    exitcodes=0,2
    user=%(ENV_USER)s
    user=%(ENV_USER)s
    redirect_stderr=false
    redirect_stderr=false

+ 1 - 1
supervisor/skel/sample.conf

@@ -118,7 +118,7 @@ serverurl=unix:///tmp/supervisor.sock ; use a unix:// URL  for a unix socket
 ;stdout_events_enabled=false   ; emit events on stdout writes (default false)
 ;stdout_events_enabled=false   ; emit events on stdout writes (default false)
 ;stderr_logfile=/a/path        ; stderr log path, NONE for none; default AUTO
 ;stderr_logfile=/a/path        ; stderr log path, NONE for none; default AUTO
 ;stderr_logfile_maxbytes=1MB   ; max # logfile bytes b4 rotation (default 50MB)
 ;stderr_logfile_maxbytes=1MB   ; max # logfile bytes b4 rotation (default 50MB)
-;stderr_logfile_backups        ; # of stderr logfile backups (default 10)
+;stderr_logfile_backups=10     ; # of stderr logfile backups (default 10)
 ;stderr_events_enabled=false   ; emit events on stderr writes (default false)
 ;stderr_events_enabled=false   ; emit events on stderr writes (default false)
 ;environment=A="1",B="2"       ; process environment additions
 ;environment=A="1",B="2"       ; process environment additions
 ;serverurl=AUTO                ; override serverurl computation (childutils)
 ;serverurl=AUTO                ; override serverurl computation (childutils)