Skip to content

Commit

Permalink
Merge branch 'master' into awesome_stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
@FooBarWidget
FooBarWidget committed May 23, 2008
2 parents e0d4554 + 0f1f7f8 commit 14dfe74
Show file tree
Hide file tree
Showing 6 changed files with 153 additions and 4 deletions.
1 change: 1 addition & 0 deletions Rakefile
View file
Expand Up @@ -410,6 +410,7 @@ spec = Gem::Specification.new do |s|
'doc/*/*/*/*',
'doc/*/*/*/*/*',
'doc/*/*/*/*/*/*',
'man/*',
'debian/*',
'ext/apache2/*.{cpp,h,c,TXT}',
'ext/boost/*.{hpp,TXT}',
Expand Down
8 changes: 4 additions & 4 deletions ext/apache2/ApplicationPoolServer.h
View file
Expand Up @@ -516,10 +516,10 @@ class ApplicationPoolServer {
ret = mkfifo(filename, S_IRUSR | S_IWUSR);
} while (ret == -1 && errno == EINTR);
if (ret == -1 && errno != EEXIST) {
fprintf(stderr, "*** WARNING: Could not create FIFO '%s'; "
"disabling Passenger ApplicationPool status reporting.\n",
filename);
fflush(stderr);
int e = errno;
P_WARN("*** WARNING: Could not create FIFO '" << filename <<
"': " << strerror(e) << " (" << e << ")" << endl <<
"Disabling Passenger ApplicationPool status reporting.");
statusReportFIFO = "";
} else {
statusReportFIFO = filename;
Expand Down
29 changes: 29 additions & 0 deletions man/passenger-config.1
View file
@@ -0,0 +1,29 @@
.TH "passenger-config" "1" "1.1.0" "Phusion Passenger" "User Commands"
.SH "NAME"
.LP
passenger\-config \- Show configuration settings for Phusion Passenger
.SH "SYNOPSIS"
.LP
\fBpassenger\-config\fR \fI\-\-root\fR | \fI\-\-version\fR
.SH "DESCRIPTION"
.LP
\fBpassenger\-config\fR shows the current configuration settings for Phusion Passenger. You need to select one of the following options.
.SH "OPTIONS"
.TP
\fB\-\-root\fR
Shows the Phusion Passenger root directory
.TP
\fB\-\-version\fR
Shows the current Phusion Passenger version number
.SH "SEE ALSO"
.LP
passenger\-memory\-stats (1), passenger\-stress\-test (1), passenger-status (8)
.LP
Users guide at http://www.modrails.com/documentation.html
.SH "AUTHOR"
.LP
Phusion Passenger is written by Phusion (http://www.phusion.nl)
.LP
"Phusion" and "Phusion Passenger" are trademarks of Hongli Lai & Ninh Bui.
.LP
This manual page was written by Neil Wilson <neil@brightbox.co.uk> for the Ubuntu project (but may be used by others).
33 changes: 33 additions & 0 deletions man/passenger-memory-stats.1
View file
@@ -0,0 +1,33 @@
.TH "passenger-memory-stats" "1" "1.1.0" "Phusion" "User Commands"
.SH "NAME"
.LP
passenger\-memory\-stats \- reports a snapshot of the Apache and Phusion Passenger memory statistcs
.SH "SYNTAX"
.LP
\fBpassenger\-memory\-stats\fR
.SH "DESCRIPTION"
.LP
\fBpassenger\-memory\-stats\fR allows you to easily analyze the real memory usage of Phusion Passenger and Apache.
.LP
Process inspection tools such as \fIps\fR and \fItop\fR are useful, but they rarely show the correct memory usage. The real memory usage is usually lower than what \fIps\fR and \fItop\fR report.
.LP
There are many technical reasons why this is so, but an explanation is beyond the scope of this page. We refer the interested reader to operating systems literature about virtual memory and copy\-on\-write.
.LP
When you run this tool the \fIPrivate\fR or \fIprivate dirty RSS\fR field shows the real memory usage of processes.
.SH "ENVIRONMENT VARIABLES"
.LP
.TP
\fBHTTPD\fR
The full filename to the Apache executable. By default, Passenger will attempt to autodetect the Apache executable. If autodetection fails for whatever reason, then Apache processes will not be shown in the memory statistics. In that case, you may manually specify the location to the Apache executable using this environment variable.
.SH "SEE ALSO"
.LP
passenger\-status(8), ps(1), top(1),
.LP
Users guide at http://www.modrails.com/documentation.html
.SH "AUTHOR"
.LP
Phusion Passenger is written by Phusion (http://www.phusion.nl)
.LP
"Phusion" and "Phusion Passenger" are trademarks of Hongli Lai & Ninh Bui.
.LP
This manual page was written by Neil Wilson <neil@brightbox.co.uk> for the Ubuntu project (but may be used by others).
43 changes: 43 additions & 0 deletions man/passenger-status.8
View file
@@ -0,0 +1,43 @@
.TH "passenger-status" "8" "1.1.0" "Phusion Passenger" "Adminstration Commands"
.SH "NAME"
.LP
passenger\-status \- inspect Phusion Passenger's internal status
.SH "SYNTAX"
.LP
\fBpassenger\-status\fR [\fIpid\fR]
.SH "DESCRIPTION"
.LP
\fBpassenger\-status\fR looks at the current status of a Phusion Passenger installation. It will locate Phusion Passenger automatically if it is running and will give you a list of instances if there is more than one Phusion Passenger instance running. You can then select the instance by specifying the relevant PID on the command line.
.LP
The \fIgeneral information\fR section shows the following details:
.TP
max
The maximum number of application instances that Phusion Passenger will spawn. This equals the value given for \fIRailsMaxPoolSize\fR in the configuration.
.TP
count
The number of application instances that are currently alive. This value is always less than or equal to \fImax\fR.
.TP
active
The number of application instances that are currently processing requests. This value is always less than or equal to \fIcount\fR.
.TP
inactive
The number of application instances that are currently not processing requests, i.e. are idle. Idle application instances will be shutdown after a while, as can be specified with \fIRailsPoolIdleTime\fR in the configuration. The value of \fIinactive\fR equals \fIcount\fR \- \fIactive\fR.
.LP
The \fIapplications\fR section shows each application instance, which directory it belongs to. The \fIsessions\fR field shows how many HTTP client are currently being processed by that application instance.
.SH "OPTIONS"
.LP
.TP
\fBpid\fR
The process ID of the Phusion Passenger instance you want to look at
.SH "SEE ALSO"
.LP
passenger\-memory\-stats(1), ps(1), top(1)
.LP
Users guide at http://www.modrails.com/documentation.html
.SH "AUTHOR"
.LP
Phusion Passenger is written by Phusion (http://www.phusion.nl)
.LP
"Phusion" and "Phusion Passenger" are trademarks of Hongli Lai & Ninh Bui.
.LP
This manual page was written by Neil Wilson <neil@brightbox.co.uk> for the Ubuntu project (but may be used by others).
43 changes: 43 additions & 0 deletions man/passenger-stress-test.1
View file
@@ -0,0 +1,43 @@
.TH "passenger-stress-test" "1" "1.1.0" "Phusion Passenger" "User Commands"
.SH "NAME"
.LP
passenger\-stress\-test \- stress tests a Phusion Passenger powered website.
.SH "SYNTAX"
.LP
\fBpassenger\-stress\-test\fR <\fIhostname\fR> <\fIapp_roo\fRt> [\fIoptions\fR]
.SH "DESCRIPTION"
.LP
Stress test the given (Phusion Passenger\-powered) website by
.LP
\- crawling it with multiple concurrently running crawlers.
.LP
\- gracefully restarting Apache at random times
.LP
\- restarting the target (Phusion Passenger\-powered) application at random times
.SH "OPTIONS"
.LP
.TP
\fB\-c, \-\-concurrency\fR <\fInumber\fR>
Number of crawlers to start (default = 20)
.TP
\fB\-p, \-\-apache\-restart\-interval\fR <\fIinterval\fR>
Gracefully restart Apache after <\fIinterval\fR> minutes (default = 1440)
.TP
\fB\-a, \-\-app\-restart\-interval\fR <\fIinterval\fR>
Restart the application after <\fIinterval\fR> minutes (default = 55)
.TP
\fB\-h, \-\-help\fR
Output help information and exit.

.SH "SEE ALSO"
.LP
passenger\-config(1), passenger\-memory\-stats(1)
.LP
Users guide at http://www.modrails.com/documentation.html
.SH "AUTHOR"
.LP
Phusion Passenger is written by Phusion (http://www.phusion.nl)
.LP
"Phusion" and "Phusion Passenger" are trademarks of Hongli Lai & Ninh Bui.
.LP
This manual page was written by Neil Wilson <neil@brightbox.co.uk> for the Ubuntu project (but may be used by others).

0 comments on commit 14dfe74

Please sign in to comment.