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

Merge branch 'develop' of https://github.com/mariadb-corporation/MaxScale into develop

Browse Source
This commit is contained in:
Markus Makela
2014-10-14 19:16:50 +03:00
parent 56b82acb1b 6707d6d0cf
commit 25bef90508
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/core/gateway.c
View File

@ -539,7 +539,7 @@ return_succp:
static bool resolve_maxscale_homedir( static bool resolve_maxscale_homedir(
char** p_home_dir) char** p_home_dir)
{ {
bool succp = false; bool succp;
char* tmp; char* tmp;
char* log_context = NULL; char* log_context = NULL;
@ -627,8 +627,13 @@ check_home_dir:
free(errstr); free(errstr);
free(logstr); free(logstr);
succp = false;
} }
else if (!daemon_mode) else
{
succp = true;
if (!daemon_mode)
{ {
fprintf(stderr, fprintf(stderr,
"Using %s as MAXSCALE_HOME = %s\n", "Using %s as MAXSCALE_HOME = %s\n",
@ -636,6 +641,11 @@ check_home_dir:
tmp); tmp);
} }
} }
}
else
{
succp = false;
}
free (tmp); free (tmp);
if (log_context != NULL) if (log_context != NULL)
@ -1392,7 +1402,7 @@ int main(int argc, char **argv)
{ {
if (!resolve_maxscale_homedir(&home_dir)) if (!resolve_maxscale_homedir(&home_dir))
{ {
ss_dassert(home_dir == NULL); ss_dassert(home_dir != NULL);
rc = MAXSCALE_HOMELESS; rc = MAXSCALE_HOMELESS;
goto return_main; goto return_main;
} }