Committing updates.
This commit is contained in:
@@ -45,7 +45,7 @@ namespace Apostol {
|
|||||||
|
|
||||||
if (Config()->Flags().show_help) {
|
if (Config()->Flags().show_help) {
|
||||||
std::cerr << "Usage: " APP_NAME << " [-?hvVt] [-s signal] [-c filename]"
|
std::cerr << "Usage: " APP_NAME << " [-?hvVt] [-s signal] [-c filename]"
|
||||||
" [-p prefix] [-g directives]" LINEFEED
|
" [-p prefix] [-g directives] [-w workers] [-l locale]" LINEFEED
|
||||||
LINEFEED
|
LINEFEED
|
||||||
"Options:" LINEFEED
|
"Options:" LINEFEED
|
||||||
" -?,-h : this help" LINEFEED
|
" -?,-h : this help" LINEFEED
|
||||||
@@ -53,13 +53,14 @@ namespace Apostol {
|
|||||||
" -V : show version and configure options then exit" LINEFEED
|
" -V : show version and configure options then exit" LINEFEED
|
||||||
" -t : test configuration and exit" LINEFEED
|
" -t : test configuration and exit" LINEFEED
|
||||||
" -s signal : send signal to a master process: stop, quit, reopen, reload" LINEFEED
|
" -s signal : send signal to a master process: stop, quit, reopen, reload" LINEFEED
|
||||||
|
" -c filename : set configuration file (default: " APP_CONF_FILE ")" LINEFEED
|
||||||
#ifdef APP_PREFIX
|
#ifdef APP_PREFIX
|
||||||
" -p prefix : set prefix path (default: " APP_PREFIX ")" LINEFEED
|
" -p prefix : set prefix path (default: " APP_PREFIX ")" LINEFEED
|
||||||
#else
|
#else
|
||||||
" -p prefix : set prefix path (default: NONE)" LINEFEED
|
" -p prefix : set prefix path (default: NONE)" LINEFEED
|
||||||
#endif
|
#endif
|
||||||
" -c filename : set configuration file (default: " APP_CONF_FILE ")" LINEFEED
|
|
||||||
" -g directives : set global directives out of configuration file" LINEFEED
|
" -g directives : set global directives out of configuration file" LINEFEED
|
||||||
|
" -w workers : set count of worker processes (default: 0 - automatically)" LINEFEED
|
||||||
" -l locale : set locale (default: " APP_DEFAULT_LOCALE ")" LINEFEED
|
" -l locale : set locale (default: " APP_DEFAULT_LOCALE ")" LINEFEED
|
||||||
<< std::endl;
|
<< std::endl;
|
||||||
}
|
}
|
||||||
@@ -140,6 +141,19 @@ namespace Apostol {
|
|||||||
|
|
||||||
throw Delphi::Exception::Exception(_T("option \"-g\" requires parameter"));
|
throw Delphi::Exception::Exception(_T("option \"-g\" requires parameter"));
|
||||||
|
|
||||||
|
case 'w':
|
||||||
|
if (*P) {
|
||||||
|
Config()->Workers(StrToIntDef(P, 0));
|
||||||
|
goto next;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (++i < argc() && !argv()[i].empty()) {
|
||||||
|
Config()->Workers(StrToIntDef(argv()[i].c_str(), 0));
|
||||||
|
goto next;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw Delphi::Exception::Exception(_T("option \"-w\" requires parameter"));
|
||||||
|
|
||||||
case 's':
|
case 's':
|
||||||
if (*P) {
|
if (*P) {
|
||||||
Config()->Signal(P);
|
Config()->Signal(P);
|
||||||
@@ -248,7 +262,7 @@ int main(int argc, char *argv[]) {
|
|||||||
|
|
||||||
int exitcode;
|
int exitcode;
|
||||||
|
|
||||||
DefaultLocale.SetLocale("en-US");
|
DefaultLocale.SetLocale(APP_DEFAULT_LOCALE);
|
||||||
|
|
||||||
CDealModule dm(argc, argv);
|
CDealModule dm(argc, argv);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user