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

MXS-1664 Add --runtimedir config parameter

Browse Source
This commit is contained in:
Marko
2018-06-29 09:23:00 +03:00
parent 40376bd12a
commit d3c1ec4742
1 changed files with 43 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
server/core/gateway.cc
View File

@ -120,6 +120,7 @@ static struct option long_options[] =
{"language", required_argument, 0, 'N'}, {"language", required_argument, 0, 'N'},
{"piddir", required_argument, 0, 'P'}, {"piddir", required_argument, 0, 'P'},
{"basedir", required_argument, 0, 'R'}, {"basedir", required_argument, 0, 'R'},
{"runtimedir", required_argument, 0, 'r'},
{"user", required_argument, 0, 'U'}, {"user", required_argument, 0, 'U'},
{"syslog", required_argument, 0, 's'}, {"syslog", required_argument, 0, 's'},
{"maxlog", required_argument, 0, 'S'}, {"maxlog", required_argument, 0, 'S'},
@ -967,6 +968,7 @@ static void usage(void)
" -N, --language=PATH path to errmsg.sys file\n" " -N, --language=PATH path to errmsg.sys file\n"
" -P, --piddir=PATH path to PID file directory\n" " -P, --piddir=PATH path to PID file directory\n"
" -R, --basedir=PATH base path for all other paths\n" " -R, --basedir=PATH base path for all other paths\n"
" -r --runtimedir=PATH base path for all other paths expect binaries\n"
" -U, --user=USER user ID and group ID of specified user are used to\n" " -U, --user=USER user ID and group ID of specified user are used to\n"
" run MaxScale\n" " 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"
@ -1202,14 +1204,7 @@ bool configure_signals(void)
return true; return true;
} }
/** bool set_runtime_dirs(const char *basedir)
* Set the directories of MaxScale relative to a basedir
*
* @param basedir The base directory relative to which the other are set.
*
* @return True if the directories could be set, false otherwise.
*/
bool set_dirs(const char *basedir)
{ {
bool rv = true; bool rv = true;
char *path; char *path;
@ -1224,11 +1219,6 @@ bool set_dirs(const char *basedir)
set_cachedir(path); set_cachedir(path);
} }
if (rv && (rv = handle_path_arg(&path, basedir, MXS_DEFAULT_LIB_SUBPATH, true, false)))
{
set_libdir(path);
}
if (rv && (rv = handle_path_arg(&path, basedir, MXS_DEFAULT_CONFIG_SUBPATH, true, false))) if (rv && (rv = handle_path_arg(&path, basedir, MXS_DEFAULT_CONFIG_SUBPATH, true, false)))
{ {
set_configdir(path); set_configdir(path);
@ -1244,11 +1234,6 @@ bool set_dirs(const char *basedir)
set_datadir(path); set_datadir(path);
} }
if (rv && (rv = handle_path_arg(&path, basedir, MXS_DEFAULT_EXEC_SUBPATH, true, false)))
{
set_execdir(path);
}
if (rv && (rv = handle_path_arg(&path, basedir, "var/" MXS_DEFAULT_LANG_SUBPATH, true, false))) if (rv && (rv = handle_path_arg(&path, basedir, "var/" MXS_DEFAULT_LANG_SUBPATH, true, false)))
{ {
set_langdir(path); set_langdir(path);
@ -1259,7 +1244,7 @@ bool set_dirs(const char *basedir)
set_piddir(path); set_piddir(path);
} }
if (rv && (rv = handle_path_arg(&path, basedir, MXS_DEFAULT_DATA_SUBPATH "/" if (rv && (rv = handle_path_arg(&path, basedir, "var/" MXS_DEFAULT_DATA_SUBPATH "/"
MXS_DEFAULT_CONFIG_PERSIST_SUBPATH, true, true))) MXS_DEFAULT_CONFIG_PERSIST_SUBPATH, true, true)))
{ {
set_config_persistdir(path); set_config_persistdir(path);
@ -1274,6 +1259,33 @@ bool set_dirs(const char *basedir)
return rv; return rv;
} }
/**
* Set the directories of MaxScale relative to a basedir
*
* @param basedir The base directory relative to which the other are set.
*
* @return True if the directories could be set, false otherwise.
*/
bool set_dirs(const char *basedir)
{
bool rv = true;
char *path;
rv = set_runtime_dirs(basedir);
if (rv && (rv = handle_path_arg(&path, basedir, MXS_DEFAULT_LIB_SUBPATH, true, false)))
{
set_libdir(path);
}
if (rv && (rv = handle_path_arg(&path, basedir, MXS_DEFAULT_EXEC_SUBPATH, true, false)))
{
set_execdir(path);
}
return rv;
}
/** /**
* @mainpage * @mainpage
* The main entry point into MaxScale * The main entry point into MaxScale
@ -1575,6 +1587,18 @@ int main(int argc, char **argv)
} }
break; break;
case 'r':
if (handle_path_arg(&tmp_path, optarg, NULL, true, false))
{
succp = set_runtime_dirs(tmp_path);
free(tmp_path);
}
else
{
succp = false;
}
break;
case 'S': case 'S':
{ {
char* tok = strstr(optarg, "="); char* tok = strstr(optarg, "=");