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

Ignore the default value of connector_plugindir

Browse Source 
The default value isn't a valid path and should be changed later on.
This commit is contained in:
Markus Mäkelä 2021-02-11 16:41:48 +02:00
parent e48c5d11fc
commit 3620db9b0a
No known key found for this signature in database
GPG Key ID: 5CE746D557ACC499
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/core/gateway.cc
View File

@ -2696,6 +2696,16 @@ bool handle_path_arg(char** dest, const char* path, const char* arg, bool rd, bo
bool check_paths()
{
// The default path for the connector_plugindir isn't valid. This doesn't matter that much as we don't
// include the plugins in the installation.
if (strcmp(get_connector_plugindir(), default_connector_plugindir) != 0)
{
if (!check_dir_access(get_connector_plugindir(), true, false))
{
return false;
}
}
return check_dir_access(get_logdir(), true, false)
&& check_dir_access(get_cachedir(), true, true)
&& check_dir_access(get_configdir(), true, false)
@ -2704,7 +2714,6 @@ bool check_paths()
&& check_dir_access(get_langdir(), true, false)
&& check_dir_access(get_piddir(), true, true)
&& check_dir_access(get_config_persistdir(), true, true)
&& check_dir_access(get_connector_plugindir(), true, false)
&& check_dir_access(get_libdir(), true, false)
&& check_dir_access(get_execdir(), true, false);
}

2
test/maxscale_test.cnf
View File

@ -8,8 +8,6 @@ language=@CMAKE_INSTALL_PREFIX@/lib/maxscale/
piddir=@CMAKE_INSTALL_PREFIX@/run/maxscale/
persistdir=@CMAKE_INSTALL_PREFIX@/lib/maxscale/maxscale.cnf.d/
module_configdir=@CMAKE_INSTALL_PREFIX@/etc/maxscale.modules.d/
# This isn't really correct but it's OK as long as it's an empty directory
connector_plugindir=@CMAKE_INSTALL_PREFIX@/etc/maxscale.modules.d/
admin_auth=false
[server1]

2
test/maxscale_test_secondary.cnf
View File

@ -8,8 +8,6 @@ language=@CMAKE_INSTALL_PREFIX@/secondary/lib/maxscale/
piddir=@CMAKE_INSTALL_PREFIX@/secondary/run/maxscale
persistdir=@CMAKE_INSTALL_PREFIX@/secondary/lib/maxscale/maxscale.cnf.d/
module_configdir=@CMAKE_INSTALL_PREFIX@/secondary/etc/maxscale.modules.d/
# This isn't really correct but it's OK as long as it's an empty directory
connector_plugindir=@CMAKE_INSTALL_PREFIX@/secondary/etc/maxscale.modules.d/
admin_auth=false
admin_port=8990