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

Merge branch '2.1' into develop

Browse Source 
MXS-1377
This commit is contained in:
Johan Wikman
2017-09-20 11:01:16 +03:00
parent 68bcd00a22 9d9cffe4c7
commit 1b009f94cf
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION21.cmake
View File

@ -5,7 +5,7 @@
set(MAXSCALE_VERSION_MAJOR "2" CACHE STRING "Major version") set(MAXSCALE_VERSION_MAJOR "2" CACHE STRING "Major version")
set(MAXSCALE_VERSION_MINOR "1" CACHE STRING "Minor version") set(MAXSCALE_VERSION_MINOR "1" CACHE STRING "Minor version")
set(MAXSCALE_VERSION_PATCH "8" CACHE STRING "Patch version") set(MAXSCALE_VERSION_PATCH "9" CACHE STRING "Patch version")
# This should only be incremented if a package is rebuilt # This should only be incremented if a package is rebuilt
set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number") set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number")

12
server/core/gateway.cc
View File

@ -1278,6 +1278,7 @@ int main(int argc, char **argv)
void (*exitfunp[4])(void) = { mxs_log_finish, cleanup_process_datadir, write_footer, NULL }; void (*exitfunp[4])(void) = { mxs_log_finish, cleanup_process_datadir, write_footer, NULL };
MXS_CONFIG* cnf = NULL; MXS_CONFIG* cnf = NULL;
int numlocks = 0; int numlocks = 0;
bool pid_file_created = false;
Worker* worker; Worker* worker;
*syslog_enabled = 1; *syslog_enabled = 1;
@ -1895,6 +1896,8 @@ int main(int argc, char **argv)
rc = MAXSCALE_ALREADYRUNNING; rc = MAXSCALE_ALREADYRUNNING;
goto return_main; goto return_main;
} }
pid_file_created = true;
} }
if (!redirect_output_to.empty()) if (!redirect_output_to.empty())
@ -2124,18 +2127,21 @@ int main(int argc, char **argv)
utils_end(); utils_end();
cleanup_process_datadir(); cleanup_process_datadir();
MXS_NOTICE("MaxScale shutdown completed."); MXS_NOTICE("MaxScale shutdown completed.");
if (unload_modules_at_exit) if (unload_modules_at_exit)
{ {
unload_all_modules(); unload_all_modules();
} }
/* Remove Pidfile */
unlock_pidfile();
unlink_pidfile();
ERR_free_strings(); ERR_free_strings();
EVP_cleanup(); EVP_cleanup();
return_main: return_main:
if (pid_file_created)
{
unlock_pidfile();
unlink_pidfile();
}
mxs_log_flush_sync(); mxs_log_flush_sync();