hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-825: Add support for --execdir

Browse Source 
Although claimed in the output of "--help", the long option
"--execdir" was not supported. Support for that now added.

The long options have now also been sorted in the same order
as the options are displayed by the help, to make it easy to
check that everything is there.

Further, the description column of the output of --help has
been aligned.
This commit is contained in:
Johan Wikman
2016-09-08 13:01:40 +03:00
parent a474dad753
commit a074605c58
1 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
server/core/gateway.c
View File

@ -124,23 +124,24 @@ const char *progname = NULL;
static struct option long_options[] = static struct option long_options[] =
{ {
{"config-check", no_argument, 0, 'c'}, {"config-check", no_argument, 0, 'c'},
{"config", required_argument, 0, 'f'},
{"nodaemon", no_argument, 0, 'd'}, {"nodaemon", no_argument, 0, 'd'},
{"config", required_argument, 0, 'f'},
{"log", required_argument, 0, 'l'}, {"log", required_argument, 0, 'l'},
{"logdir", required_argument, 0, 'L'}, {"logdir", required_argument, 0, 'L'},
{"datadir", required_argument, 0, 'D'},
{"configdir", required_argument, 0, 'C'},
{"piddir", required_argument, 0, 'P'},
{"libdir", required_argument, 0, 'B'},
{"cachedir", required_argument, 0, 'A'}, {"cachedir", required_argument, 0, 'A'},
{"libdir", required_argument, 0, 'B'},
{"configdir", required_argument, 0, 'C'},
{"datadir", required_argument, 0, 'D'},
{"execdir", required_argument, 0, 'E'},
{"language", required_argument, 0, 'N'}, {"language", required_argument, 0, 'N'},
{"syslog", required_argument, 0, 's'}, {"piddir", required_argument, 0, 'P'},
{"maxlog", required_argument, 0, 'S'},
{"user", required_argument, 0, 'U'}, {"user", required_argument, 0, 'U'},
{"version", no_argument, 0, 'v'}, {"syslog", required_argument, 0, 's'},
{"help", no_argument, 0, '?'}, {"maxlog", required_argument, 0, 'S'},
{"version-full", no_argument, 0, 'V'},
{"log_augmentation", required_argument, 0, 'G'}, {"log_augmentation", required_argument, 0, 'G'},
{"version", no_argument, 0, 'v'},
{"version-full", no_argument, 0, 'V'},
{"help", no_argument, 0, '?'},
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
static bool syslog_configured = false; static bool syslog_configured = false;
@ -874,31 +875,31 @@ static void usage(void)
{ {
fprintf(stderr, fprintf(stderr,
"\nUsage : %s [OPTION]...\n\n" "\nUsage : %s [OPTION]...\n\n"
" -c, --config-check Validate configuration file and exit\n" " -c, --config-check Validate configuration file and exit\n"
" -d, --nodaemon enable running in terminal process (default:disabled)\n" " -d, --nodaemon enable running in terminal process (default:disabled)\n"
" -f, --config=FILE relative or absolute pathname of MaxScale configuration file\n" " -f, --config=FILE relative or absolute pathname of MaxScale configuration file\n"
" (default:/etc/maxscale.cnf)\n" " (default:/etc/maxscale.cnf)\n"
" -l, --log=[file|shm|stdout] log to file, shared memory or stdout (default: file)\n" " -l, --log=[file|shm|stdout] log to file, shared memory or stdout (default: file)\n"
" -L, --logdir=PATH path to log file directory (default: /var/log/maxscale)\n" " -L, --logdir=PATH path to log file directory (default: /var/log/maxscale)\n"
" -A, --cachedir=PATH path to cache directory (default: /var/cache/maxscale)\n" " -A, --cachedir=PATH path to cache directory (default: /var/cache/maxscale)\n"
" -B, --libdir=PATH path to module directory (default: /usr/lib64/maxscale)\n" " -B, --libdir=PATH path to module directory (default: /usr/lib64/maxscale)\n"
" -C, --configdir=PATH path to configuration file directory (default: /etc/)\n" " -C, --configdir=PATH path to configuration file directory (default: /etc/)\n"
" -D, --datadir=PATH path to data directory, stored embedded mysql tables\n" " -D, --datadir=PATH path to data directory, stored embedded mysql tables\n"
" (default: /var/cache/maxscale)\n" " (default: /var/cache/maxscale)\n"
" -E, --execdir=PATH path to the maxscale and other executable files\n" " -E, --execdir=PATH path to the maxscale and other executable files\n"
" (default: /usr/bin)\n" " (default: /usr/bin)\n"
" -N, --language=PATH path to errmsg.sys file (default: /var/lib/maxscale)\n" " -N, --language=PATH path to errmsg.sys file (default: /var/lib/maxscale)\n"
" -P, --piddir=PATH path to PID file directory (default: /var/run/maxscale)\n" " -P, --piddir=PATH path to PID file directory (default: /var/run/maxscale)\n"
" -U, --user=USER run MaxScale as another user.\n" " -U, --user=USER run MaxScale as another user.\n"
" The user ID and group ID of this user are used to run MaxScale.\n" " The user ID and group ID of this user are used to run MaxScale.\n"
" -s, --syslog=[yes|no] log messages to syslog (default:yes)\n" " -s, --syslog=[yes|no] log messages to syslog (default:yes)\n"
" -S, --maxlog=[yes|no] log messages to MaxScale log (default: yes)\n" " -S, --maxlog=[yes|no] log messages to MaxScale log (default: yes)\n"
" -G, --log_augmentation=0|1 augment messages with the name of the function where\n" " -G, --log_augmentation=0|1 augment messages with the name of the function where\n"
" the message was logged (default: 0). Primarily for \n" " the message was logged (default: 0). Primarily for \n"
" development purposes.\n" " development purposes.\n"
" -v, --version print version info and exit\n" " -v, --version print version info and exit\n"
" -V, --version-full print full version info and exit\n" " -V, --version-full print full version info and exit\n"
" -?, --help show this help\n" " -?, --help show this help\n"
, progname); , progname);
} }