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

The datadir path is now used as the location where the process specific data directories are created.

Browse Source
This commit is contained in:
Markus Makela
2015-09-03 19:28:59 +03:00
parent 81506c61eb
commit 30cdda48c6
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/gateway.c
View File

@ -1702,7 +1702,7 @@ int main(int argc, char **argv)
* machine. * machine.
*/ */
snprintf(datadir,PATH_MAX,"%s/data",get_datadir()); snprintf(datadir,PATH_MAX, "%s", get_datadir());
datadir[PATH_MAX] = '\0'; datadir[PATH_MAX] = '\0';
if(mkdir(datadir, 0777) != 0){ if(mkdir(datadir, 0777) != 0){
@ -1713,7 +1713,7 @@ int main(int argc, char **argv)
} }
} }
snprintf(datadir,PATH_MAX, "%s/data/data%d", get_datadir(), getpid()); snprintf(datadir,PATH_MAX, "%s/data%d", get_datadir(), getpid());
if(mkdir(datadir, 0777) != 0){ if(mkdir(datadir, 0777) != 0){

2
server/include/gwdirs.h.in
View File

@ -30,7 +30,7 @@ static const char* default_piddir = "@MAXSCALE_VARDIR@/run/maxscale"; /*< This s
* the /var/run folder is an old standard and the newer FSH 3.0 * the /var/run folder is an old standard and the newer FSH 3.0
* uses /run for PID files.*/ * uses /run for PID files.*/
static const char* default_logdir = "@MAXSCALE_VARDIR@/log/maxscale"; static const char* default_logdir = "@MAXSCALE_VARDIR@/log/maxscale";
static const char* default_datadir = "@MAXSCALE_VARDIR@/lib/maxscale"; static const char* default_datadir = "@MAXSCALE_VARDIR@/lib/maxscale/data";
static const char* default_libdir = "@CMAKE_INSTALL_PREFIX@/@MAXSCALE_LIBDIR@"; static const char* default_libdir = "@CMAKE_INSTALL_PREFIX@/@MAXSCALE_LIBDIR@";
static const char* default_cachedir = "@MAXSCALE_VARDIR@/cache/maxscale"; static const char* default_cachedir = "@MAXSCALE_VARDIR@/cache/maxscale";
static const char* default_langdir = "@MAXSCALE_VARDIR@/lib/maxscale"; static const char* default_langdir = "@MAXSCALE_VARDIR@/lib/maxscale";

2
server/test/maxscale_test.cnf
View File

@ -2,7 +2,7 @@
threads=4 threads=4
libdir=@CMAKE_INSTALL_PREFIX@/@MAXSCALE_LIBDIR@ libdir=@CMAKE_INSTALL_PREFIX@/@MAXSCALE_LIBDIR@
logdir=@CMAKE_INSTALL_PREFIX@/ logdir=@CMAKE_INSTALL_PREFIX@/
datadir=@CMAKE_INSTALL_PREFIX@/ datadir=@CMAKE_INSTALL_PREFIX@/data/
cachedir=@CMAKE_INSTALL_PREFIX@/ cachedir=@CMAKE_INSTALL_PREFIX@/
language=@CMAKE_INSTALL_PREFIX@/lib/maxscale/ language=@CMAKE_INSTALL_PREFIX@/lib/maxscale/
piddir=@CMAKE_INSTALL_PREFIX@/ piddir=@CMAKE_INSTALL_PREFIX@/