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

Log manager is initialized before configu file name resolution so that if home directory is successfully set, further issues would be logged in log files located under home directory instead of /tmp/..

Browse Source
This commit is contained in:
vraatikka 2013-12-01 21:37:40 +02:00
parent 6d0d85396e
commit 4a006dd707
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
server/core/gateway.c
View File

@ -973,7 +973,9 @@ int main(int argc, char **argv)
{
char* logerr = "Home directory argument "
"identifier \'-c\' was specified but "
"the argument was missing.";
"the argument didn't specify \n a valid "
"home directory or the argument was "
"missing.";
print_log_n_stderr(true, true, logerr, logerr, 0);
usage();
succp = false;
@ -993,7 +995,9 @@ int main(int argc, char **argv)
{
char* logerr = "Configuration file argument "
"identifier \'-f\' was specified but "
"the argument was missing.";
"the argument didn't specify\n a valid "
"configuration file or the argument "
"was missing.";
print_log_n_stderr(true, true, logerr, logerr, 0);
usage();
succp = false;
@ -1159,25 +1163,6 @@ int main(int argc, char **argv)
setenv("MYSQL_HOME", mysql_home, 1);
}
/**
* Resolve the full pathname for configuration file and check for
* read accessibility.
*/
if (!resolve_maxscale_conf_fname(&cnf_file_path, home_dir, cnf_file_arg))
{
ss_dassert(cnf_file_path == NULL);
rc = 1;
goto return_main;
}
/**
* Set a data directory for the mysqld library, we use
* a unique directory name to avoid clauses if multiple
* instances of the gateway are beign run on the same
* machine.
*/
sprintf(datadir, "%s/data%d", home_dir, getpid());
mkdir(datadir, 0777);
/**
* Init Log Manager for MaxScale.
@ -1203,6 +1188,26 @@ int main(int argc, char **argv)
skygw_logmanager_init(7, argv);
}
/**
* Resolve the full pathname for configuration file and check for
* read accessibility.
*/
if (!resolve_maxscale_conf_fname(&cnf_file_path, home_dir, cnf_file_arg))
{
ss_dassert(cnf_file_path == NULL);
rc = 1;
goto return_main;
}
/**
* Set a data directory for the mysqld library, we use
* a unique directory name to avoid clauses if multiple
* instances of the gateway are beign run on the same
* machine.
*/
sprintf(datadir, "%s/data%d", home_dir, getpid());
mkdir(datadir, 0777);
if (!daemon_mode)
{
fprintf(stderr,