From d7f847eabf14bfaba9df373af8e28abfb60de9f5 Mon Sep 17 00:00:00 2001 From: Stefan Fritsch Date: Wed, 22 Jun 2011 21:34:41 +0000 Subject: [PATCH] update transforms, 2nd try :-/ git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1138643 13f79535-47bb-0310-9956-ffa450edef68 --- docs/man/rotatelogs.8 | 7 +- docs/manual/convenience.map | 2 +- docs/manual/misc/perf-tuning.html.en | 2 +- docs/manual/misc/security_tips.html.en | 2 +- docs/manual/mod/core.html.en | 17 ++-- docs/manual/mod/directives.html.en | 4 +- docs/manual/mod/directives.html.es | 4 +- docs/manual/mod/directives.html.ko.euc-kr | 4 +- docs/manual/mod/directives.html.zh-cn | 4 +- docs/manual/mod/event.html.en | 2 +- docs/manual/mod/event.html.fr | 2 +- docs/manual/mod/mpm_common.html.en | 88 ++++++++++--------- docs/manual/mod/prefork.html.en | 12 +-- docs/manual/mod/quickreference.html.en | 10 +-- docs/manual/mod/quickreference.html.es | 10 +-- docs/manual/mod/quickreference.html.ko.euc-kr | 10 +-- docs/manual/mod/quickreference.html.zh-cn | 10 +-- docs/manual/mod/worker.html.en | 16 ++-- docs/manual/programs/rotatelogs.html.en | 10 +++ 19 files changed, 118 insertions(+), 98 deletions(-) diff --git a/docs/man/rotatelogs.8 b/docs/man/rotatelogs.8 index 5a5dadaaea..e850353438 100644 --- a/docs/man/rotatelogs.8 +++ b/docs/man/rotatelogs.8 @@ -19,7 +19,7 @@ .el .ne 3 .IP "\\$1" \\$2 .. -.TH "ROTATELOGS" 8 "2010-12-27" "Apache HTTP Server" "rotatelogs" +.TH "ROTATELOGS" 8 "2011-06-22" "Apache HTTP Server" "rotatelogs" .SH NAME rotatelogs \- Piped logging program to rotate Apache logs @@ -27,7 +27,7 @@ rotatelogs \- Piped logging program to rotate Apache logs .SH "SYNOPSIS" .PP -\fBrotatelogs\fR [ -\fBl\fR ] [ -\fBL\fR \fIlinkname\fR ] [ -\fBf\fR ] [ -\fBv\fR ] [ -\fBe\fR ] \fIlogfile\fR \fIrotationtime\fR|\fIfilesize\fR(B|K|M|G) [ \fIoffset\fR ] +\fBrotatelogs\fR [ -\fBl\fR ] [ -\fBL\fR \fIlinkname\fR ] [ -\fBp\fR \fIprogram\fR ] [ -\fBf\fR ] [ -\fBv\fR ] [ -\fBe\fR ] \fIlogfile\fR \fIrotationtime\fR|\fIfilesize\fR(B|K|M|G) [ \fIoffset\fR ] .SH "SUMMARY" @@ -46,6 +46,9 @@ Causes the use of local time rather than GMT as the base for the interval or for -L \fIlinkname\fR Causes a hard link to be made from the current logfile to the specified link name\&. This can be used to watch the log continuously across rotations using a command like tail -F linkname\&. .TP +-p \fIprogram\fR +Causes the specified program to be executed after each rotation\&. Two arguments are supplied upon execution: the newly opened file and the previous file, respectively\&. rotatelogs does not wait for the specified program to terminate before continuing to operate, and will not log any error code returned on termination\&. The spawned program uses the same stdin, stdout, and stderr as rotatelogs itself, and also inherits the environment\&. +.TP -f Causes the logfile to be opened immediately, as soon as rotatelogs starts, instead of waiting for the first logfile entry to be read (for non-busy sites, there may be a substantial delay between when the server is started and when the first request is handled, meaning that the associated logfile does not "exist" until then, which causes problems from some automated logging tools) .TP diff --git a/docs/manual/convenience.map b/docs/manual/convenience.map index 74f3a1571d..56eb633e19 100644 --- a/docs/manual/convenience.map +++ b/docs/manual/convenience.map @@ -300,10 +300,10 @@ luapackagepath mod/mod_lua.html#luapackagepath luaquickhandler mod/mod_lua.html#luaquickhandler luaroot mod/mod_lua.html#luaroot luascope mod/mod_lua.html#luascope -maxclients mod/mpm_common.html#maxclients maxconnectionsperchild mod/mpm_common.html#maxconnectionsperchild maxkeepaliverequests mod/core.html#maxkeepaliverequests maxmemfree mod/mpm_common.html#maxmemfree +maxrequestworkers mod/mpm_common.html#maxrequestworkers maxspareservers mod/prefork.html#maxspareservers maxsparethreads mod/mpm_common.html#maxsparethreads maxthreads mod/mpm_netware.html#maxthreads diff --git a/docs/manual/misc/perf-tuning.html.en b/docs/manual/misc/perf-tuning.html.en index 7794efc556..1b3351ff39 100644 --- a/docs/manual/misc/perf-tuning.html.en +++ b/docs/manual/misc/perf-tuning.html.en @@ -59,7 +59,7 @@ as swapping increases the latency of each request beyond a point that users consider "fast enough". This causes users to hit stop and reload, further increasing the load. You can, and - should, control the MaxClients setting so that your server + should, control the MaxRequestWorkers setting so that your server does not spawn so many children it starts swapping. This procedure for doing this is simple: determine the size of your average Apache process, by looking at your process list via a tool such as diff --git a/docs/manual/misc/security_tips.html.en b/docs/manual/misc/security_tips.html.en index b122fcf08a..977a18d125 100644 --- a/docs/manual/misc/security_tips.html.en +++ b/docs/manual/misc/security_tips.html.en @@ -115,7 +115,7 @@ system. This is active by default in Apache httpd, but may require reconfiguration of your kernel. -
  • Tune the MaxClients directive to allow +
  • Tune the MaxRequestWorkers directive to allow the server to handle the maximum number of simultaneous connections without running out of resources. See also the performance tuning documentation.
    • diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index 40053607b9..94a1457b29 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -1358,23 +1358,26 @@ in case of an error Process ID of current process %...T Thread ID of current thread -%...t +%...{g}T + System unique thread ID of current thread (the same ID as + displayed by e.g. top; currently Linux only) +%...t The current time -%...{u}t +%...{u}t The current time including micro-seconds -%...{cu}t +%...{cu}t The current time in compact ISO 8601 format, including micro-seconds -%...v +%...v The canonical ServerName of the current server. -%...V +%...V The server name of the server serving the request according to the UseCanonicalName setting. -\  (backslash space) +\  (backslash space) Non-field delimiting space -%  (percent space) +%  (percent space) Field delimiter (no output) diff --git a/docs/manual/mod/directives.html.en b/docs/manual/mod/directives.html.en index 1e32f2307f..19664a73e2 100644 --- a/docs/manual/mod/directives.html.en +++ b/docs/manual/mod/directives.html.en @@ -337,10 +337,10 @@
  • LuaQuickHandler
  • LuaRoot
  • LuaScope
    • -
  • MaxClients
    • -
  • MaxConnectionsPerChild
    • +
  • MaxConnectionsPerChild
  • MaxKeepAliveRequests
  • MaxMemFree
    • +
  • MaxRequestWorkers
  • MaxSpareServers
  • MaxSpareThreads
  • MaxThreads
    • diff --git a/docs/manual/mod/directives.html.es b/docs/manual/mod/directives.html.es index 414aa05d4a..bc5cae41a4 100644 --- a/docs/manual/mod/directives.html.es +++ b/docs/manual/mod/directives.html.es @@ -339,10 +339,10 @@
  • LuaQuickHandler
  • LuaRoot
  • LuaScope
    • -
  • MaxClients
    • -
  • MaxConnectionsPerChild
    • +
  • MaxConnectionsPerChild
  • MaxKeepAliveRequests
  • MaxMemFree
    • +
  • MaxRequestWorkers
  • MaxSpareServers
  • MaxSpareThreads
  • MaxThreads
    • diff --git a/docs/manual/mod/directives.html.ko.euc-kr b/docs/manual/mod/directives.html.ko.euc-kr index c605f3485f..a8f5c56b03 100644 --- a/docs/manual/mod/directives.html.ko.euc-kr +++ b/docs/manual/mod/directives.html.ko.euc-kr @@ -334,10 +334,10 @@
  • LuaQuickHandler
  • LuaRoot
  • LuaScope
    • -
  • MaxClients
    • -
  • MaxConnectionsPerChild
    • +
  • MaxConnectionsPerChild
  • MaxKeepAliveRequests
  • MaxMemFree
    • +
  • MaxRequestWorkers
  • MaxSpareServers
  • MaxSpareThreads
  • MaxThreads
    • diff --git a/docs/manual/mod/directives.html.zh-cn b/docs/manual/mod/directives.html.zh-cn index a15f8f1a30..1f2a3a4742 100644 --- a/docs/manual/mod/directives.html.zh-cn +++ b/docs/manual/mod/directives.html.zh-cn @@ -332,10 +332,10 @@
  • LuaQuickHandler
  • LuaRoot
  • LuaScope
    • -
  • MaxClients
    • -
  • MaxConnectionsPerChild
    • +
  • MaxConnectionsPerChild
  • MaxKeepAliveRequests
  • MaxMemFree
    • +
  • MaxRequestWorkers
  • MaxSpareServers
  • MaxSpareThreads
  • MaxThreads
    • diff --git a/docs/manual/mod/event.html.en b/docs/manual/mod/event.html.en index 84c0926ef0..af07baba4a 100644 --- a/docs/manual/mod/event.html.en +++ b/docs/manual/mod/event.html.en @@ -52,9 +52,9 @@ of consuming threads only for connections with active processing
  • Group
  • Listen
  • ListenBacklog
    • -
  • MaxClients
  • MaxConnectionsPerChild
  • MaxMemFree
    • +
  • MaxRequestWorkers
  • MaxSpareThreads
  • MinSpareThreads
  • PidFile
    • diff --git a/docs/manual/mod/event.html.fr b/docs/manual/mod/event.html.fr index 5b23e280f9..caf2d169b1 100644 --- a/docs/manual/mod/event.html.fr +++ b/docs/manual/mod/event.html.fr @@ -54,9 +54,9 @@ mobiliser des threads que pour les connexions en cours de traitement
  • Group
  • Listen
  • ListenBacklog
    • -
  • MaxClients
  • MaxConnectionsPerChild
  • MaxMemFree
    • +
  • MaxRequestWorkers
  • MaxSpareThreads
  • MinSpareThreads
  • PidFile
    • diff --git a/docs/manual/mod/mpm_common.html.en b/docs/manual/mod/mpm_common.html.en index fb24a406dc..8fbc40433b 100644 --- a/docs/manual/mod/mpm_common.html.en +++ b/docs/manual/mod/mpm_common.html.en @@ -37,9 +37,9 @@ more than one multi-processing module (MPM)
  • GracefulShutdownTimeout
  • Listen
  • ListenBackLog
    • -
  • MaxClients
  • MaxConnectionsPerChild
  • MaxMemFree
    • +
  • MaxRequestWorkers
  • MaxSpareThreads
  • MinSpareThreads
  • PidFile
    • @@ -252,39 +252,6 @@ including other causes. but use a number based on (but normally larger than) what is set.

    - -
    top
    -

    MaxClients Directive

    - - - - - - - -
    Description:Maximum number of connections that will be processed -simultaneously
    Syntax:MaxClients number
    Default:See usage for details
    Context:server config
    Status:MPM
    Module:event, prefork, worker
    -

    The MaxClients directive sets the limit - on the number of simultaneous requests that will be served. Any - connection attempts over the MaxClients - limit will normally be queued, up to a number based on the - ListenBacklog - directive. Once a child process is freed at the end of a different - request, the connection will then be serviced.

    - -

    For non-threaded servers (i.e., prefork), - MaxClients translates into the maximum - number of child processes that will be launched to serve requests. - The default value is 256; to increase it, you must also raise - ServerLimit.

    - -

    For threaded and hybrid servers (e.g. event - or worker) MaxClients restricts - the total number of threads that will be available to serve clients. - For hybrid MPMs the default value is 16 (ServerLimit) multiplied by the value of - 25 (ThreadsPerChild). Therefore, to increase MaxClients to a value that requires more than 16 processes, - you must also raise ServerLimit.

    -
    top

    MaxConnectionsPerChild Directive

    @@ -327,6 +294,43 @@ to hold without calling free() to hold without calling free(). When not set, or when set to zero, the threshold will be set to unlimited.

    +
    +
    top
    +

    MaxRequestWorkers Directive

    + + + + + + + +
    Description:Maximum number of connections that will be processed +simultaneously
    Syntax:MaxRequestWorkers number
    Default:See usage for details
    Context:server config
    Status:MPM
    Module:event, prefork, worker
    +

    The MaxRequestWorkers directive sets the limit + on the number of simultaneous requests that will be served. Any + connection attempts over the MaxRequestWorkers + limit will normally be queued, up to a number based on the + ListenBacklog + directive. Once a child process is freed at the end of a different + request, the connection will then be serviced.

    + +

    For non-threaded servers (i.e., prefork), + MaxRequestWorkers translates into the maximum + number of child processes that will be launched to serve requests. + The default value is 256; to increase it, you must also raise + ServerLimit.

    + +

    For threaded and hybrid servers (e.g. event + or worker) MaxRequestWorkers restricts + the total number of threads that will be available to serve clients. + For hybrid MPMs the default value is 16 (ServerLimit) multiplied by the value of + 25 (ThreadsPerChild). Therefore, to increase MaxRequestWorkers to a value that requires more than 16 processes, + you must also raise ServerLimit.

    + +

    MaxRequestWorkers was called + MaxClients before version 2.3.13. The old name ist still + supported.

    +
    top

    MaxSpareThreads Directive

    @@ -540,32 +544,32 @@ Apache HTTP Server Module:event, prefork, worker

    For the prefork MPM, this directive sets the - maximum configured value for MaxClients for the lifetime of the + maximum configured value for MaxRequestWorkers for the lifetime of the Apache httpd process. For the worker MPM, this directive in combination with ThreadLimit sets - the maximum configured value for MaxClients for the lifetime of the + the maximum configured value for MaxRequestWorkers for the lifetime of the Apache httpd process. Any attempts to change this directive during a - restart will be ignored, but MaxClients can be modified during + restart will be ignored, but MaxRequestWorkers can be modified during a restart.

    Special care must be taken when using this directive. If ServerLimit is set to a value much higher than necessary, extra, unused shared memory will be allocated. If - both ServerLimit and MaxClients are set to values + both ServerLimit and MaxRequestWorkers are set to values higher than the system can handle, Apache httpd may not start or the system may become unstable.

    With the prefork MPM, use this directive only - if you need to set MaxClients higher than 256 (default). + if you need to set MaxRequestWorkers higher than 256 (default). Do not set the value of this directive any higher than what you - might want to set MaxClients to.

    + might want to set MaxRequestWorkers to.

    With worker, use this directive only - if your MaxClients and + if your MaxRequestWorkers and ThreadsPerChild settings require more than 16 server processes (default). Do not set the value of this directive any higher than the number of server - processes required by what you may want for MaxClients and ThreadsPerChild.

    + processes required by what you may want for MaxRequestWorkers and ThreadsPerChild.

    Note

    There is a hard limit of ServerLimit 20000 compiled diff --git a/docs/manual/mod/prefork.html.en b/docs/manual/mod/prefork.html.en index d89edec736..1f37be9a11 100644 --- a/docs/manual/mod/prefork.html.en +++ b/docs/manual/mod/prefork.html.en @@ -42,8 +42,8 @@

    This MPM is very self-regulating, so it is rarely necessary to adjust its configuration directives. Most important is that - MaxClients be big enough to - handle as many simultaneous requests as you expect to receive, but + MaxRequestWorkers be big enough + to handle as many simultaneous requests as you expect to receive, but small enough to assure that there is enough physical RAM for all processes.

    @@ -54,9 +54,9 @@
  • Group
  • Listen
  • ListenBacklog
    • -
  • MaxClients
  • MaxConnectionsPerChild
  • MaxMemFree
    • +
  • MaxRequestWorkers
  • MaxSpareServers
  • MinSpareServers
  • PidFile
    • @@ -89,13 +89,13 @@ uses

    The StartServers, MinSpareServers, MaxSpareServers, and - MaxClients regulate how + MaxRequestWorkers regulate how the parent process creates children to serve requests. In general, Apache httpd is very self-regulating, so most sites do not need to adjust these directives from their default values. Sites which need to serve more than 256 simultaneous requests may need to - increase MaxClients, - while sites with limited memory may need to decrease MaxClients to keep the server from + increase MaxRequestWorkers, + while sites with limited memory may need to decrease MaxRequestWorkers to keep the server from thrashing (swapping memory to disk and back). More information about tuning process creation is provided in the performance hints documentation.

    diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en index c9a487cb5b..10df64b0ed 100644 --- a/docs/manual/mod/quickreference.html.en +++ b/docs/manual/mod/quickreference.html.en @@ -552,14 +552,14 @@ processing svdhXProvide a hook for the quick handler of request processing LuaRoot /path/to/a/directorysvdhXSpecify the base path for resolving relative paths for mod_lua directives LuaScope once|request|conn|server [max|min max] once svdhXOne of once, request, conn, server -- default is once -MaxClients numbersMMaximum number of connections that will be processed -simultaneously -MaxConnectionsPerChild number 0 sMLimit on the number of connections that an individual child server +MaxConnectionsPerChild number 0 sMLimit on the number of connections that an individual child server will handle during its life -MaxKeepAliveRequests number 100 svCNumber of requests allowed on a persistent +MaxKeepAliveRequests number 100 svCNumber of requests allowed on a persistent connection -MaxMemFree KBytes 0 sMMaximum amount of memory that the main allocator is allowed +MaxMemFree KBytes 0 sMMaximum amount of memory that the main allocator is allowed to hold without calling free() +MaxRequestWorkers numbersMMaximum number of connections that will be processed +simultaneously MaxSpareServers number 10 sMMaximum number of idle child server processes MaxSpareThreads numbersMMaximum number of idle threads MaxThreads number 2048 sMSet the maximum number of worker threads diff --git a/docs/manual/mod/quickreference.html.es b/docs/manual/mod/quickreference.html.es index e6a9e9790c..6cbe45fe3c 100644 --- a/docs/manual/mod/quickreference.html.es +++ b/docs/manual/mod/quickreference.html.es @@ -559,14 +559,14 @@ processing svdhXProvide a hook for the quick handler of request processing LuaRoot /path/to/a/directorysvdhXSpecify the base path for resolving relative paths for mod_lua directives LuaScope once|request|conn|server [max|min max] once svdhXOne of once, request, conn, server -- default is once -MaxClients numbersMMaximum number of connections that will be processed -simultaneously -MaxConnectionsPerChild number 0 sMLimit on the number of connections that an individual child server +MaxConnectionsPerChild number 0 sMLimit on the number of connections that an individual child server will handle during its life -MaxKeepAliveRequests number 100 svCNumber of requests allowed on a persistent +MaxKeepAliveRequests number 100 svCNumber of requests allowed on a persistent connection -MaxMemFree KBytes 0 sMMaximum amount of memory that the main allocator is allowed +MaxMemFree KBytes 0 sMMaximum amount of memory that the main allocator is allowed to hold without calling free() +MaxRequestWorkers numbersMMaximum number of connections that will be processed +simultaneously MaxSpareServers number 10 sMMaximum number of idle child server processes MaxSpareThreads numbersMMaximum number of idle threads MaxThreads number 2048 sMSet the maximum number of worker threads diff --git a/docs/manual/mod/quickreference.html.ko.euc-kr b/docs/manual/mod/quickreference.html.ko.euc-kr index aa9d5dad92..ccb72d68fd 100644 --- a/docs/manual/mod/quickreference.html.ko.euc-kr +++ b/docs/manual/mod/quickreference.html.ko.euc-kr @@ -523,14 +523,14 @@ processing svdhXProvide a hook for the quick handler of request processing LuaRoot /path/to/a/directorysvdhXSpecify the base path for resolving relative paths for mod_lua directives LuaScope once|request|conn|server [max|min max] once svdhXOne of once, request, conn, server -- default is once -MaxClients numbersMMaximum number of connections that will be processed -simultaneously -MaxConnectionsPerChild number 0 sMLimit on the number of connections that an individual child server +MaxConnectionsPerChild number 0 sMLimit on the number of connections that an individual child server will handle during its life -MaxKeepAliveRequests number 100 svCNumber of requests allowed on a persistent +MaxKeepAliveRequests number 100 svCNumber of requests allowed on a persistent connection -MaxMemFree KBytes 0 sMMaximum amount of memory that the main allocator is allowed +MaxMemFree KBytes 0 sMMaximum amount of memory that the main allocator is allowed to hold without calling free() +MaxRequestWorkers numbersMMaximum number of connections that will be processed +simultaneously MaxSpareServers number 10 sMMaximum number of idle child server processes MaxSpareThreads numbersMMaximum number of idle threads MaxThreads number 2048 sMSet the maximum number of worker threads diff --git a/docs/manual/mod/quickreference.html.zh-cn b/docs/manual/mod/quickreference.html.zh-cn index 31bec26457..3e48ddf783 100644 --- a/docs/manual/mod/quickreference.html.zh-cn +++ b/docs/manual/mod/quickreference.html.zh-cn @@ -546,14 +546,14 @@ processing svdhXProvide a hook for the quick handler of request processing LuaRoot /path/to/a/directorysvdhXSpecify the base path for resolving relative paths for mod_lua directives LuaScope once|request|conn|server [max|min max] once svdhXOne of once, request, conn, server -- default is once -MaxClients numbersMMaximum number of connections that will be processed -simultaneously -MaxConnectionsPerChild number 0 sMLimit on the number of connections that an individual child server +MaxConnectionsPerChild number 0 sMLimit on the number of connections that an individual child server will handle during its life -MaxKeepAliveRequests number 100 svCNumber of requests allowed on a persistent +MaxKeepAliveRequests number 100 svCNumber of requests allowed on a persistent connection -MaxMemFree KBytes 0 sMMaximum amount of memory that the main allocator is allowed +MaxMemFree KBytes 0 sMMaximum amount of memory that the main allocator is allowed to hold without calling free() +MaxRequestWorkers numbersMMaximum number of connections that will be processed +simultaneously MaxSpareServers number 10 sMMaximum number of idle child server processes MaxSpareThreads numbersMMaximum number of idle threads MaxThreads number 2048 sMSet the maximum number of worker threads diff --git a/docs/manual/mod/worker.html.en b/docs/manual/mod/worker.html.en index d31b7319af..c2261fed10 100644 --- a/docs/manual/mod/worker.html.en +++ b/docs/manual/mod/worker.html.en @@ -43,7 +43,7 @@

    The most important directives used to control this MPM are ThreadsPerChild, which controls the number of threads deployed by each child process and - MaxClients, which + MaxRequestWorkers, which controls the maximum total number of threads that may be launched.

    @@ -54,9 +54,9 @@
  • Group
  • Listen
  • ListenBacklog
    • -
  • MaxClients
  • MaxConnectionsPerChild
  • MaxMemFree
    • +
  • MaxRequestWorkers
  • MaxSpareThreads
  • MinSpareThreads
  • PidFile
    • @@ -99,9 +99,9 @@ these directives from their default values. The maximum number of clients that may be served simultaneously (i.e., the maximum total number of threads in all processes) is determined by the - MaxClients directive. + MaxRequestWorkers directive. The maximum number of active child processes is determined by - the MaxClients + the MaxRequestWorkers directive divided by the ThreadsPerChild directive.

    @@ -111,7 +111,7 @@ starting it again. ServerLimit is a hard limit on the number of active child processes, and must be greater than or equal to the - MaxClients + MaxRequestWorkers directive divided by the ThreadsPerChild directive. ThreadLimit is a hard @@ -121,7 +121,7 @@

    In addition to the set of active child processes, there may be additional child processes which are terminating, but where at least one server thread is still handling an existing client - connection. Up to MaxClients terminating processes + connection. Up to MaxRequestWorkers terminating processes may be present, though the actual number can be expected to be much smaller. This behavior can be avoided by disabling the termination of individual child processes, which is achieved using @@ -133,7 +133,7 @@

  • set the value of MaxSpareThreads to the same value as - MaxClients
    • + MaxRequestWorkers

    A typical configuration of the process-thread controls in @@ -142,7 +142,7 @@

    ServerLimit 16
    StartServers 2
    - MaxClients 150
    + MaxRequestWorkers 150
    MinSpareThreads 25
    MaxSpareThreads 75
    ThreadsPerChild 25 diff --git a/docs/manual/programs/rotatelogs.html.en b/docs/manual/programs/rotatelogs.html.en index a6731e4030..00ef91b1a7 100644 --- a/docs/manual/programs/rotatelogs.html.en +++ b/docs/manual/programs/rotatelogs.html.en @@ -39,6 +39,7 @@

    rotatelogs [ -l ] [ -L linkname ] + [ -p program ] [ -f ] [ -v ] [ -e ] @@ -62,6 +63,15 @@ to the specified link name. This can be used to watch the log continuously across rotations using a command like tail -F linkname. +

    -p program
    +
    Causes the specified program to be executed after each rotation. +Two arguments are supplied upon execution: the newly opened file and +the previous file, respectively. rotatelogs does not +wait for the specified program to terminate before continuing to +operate, and will not log any error code returned on termination. The +spawned program uses the same stdin, stdout, and stderr as rotatelogs +itself, and also inherits the environment.
    +
    -f
    Causes the logfile to be opened immediately, as soon as rotatelogs starts, instead of waiting for the -- 2.49.0