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

MXS-1763 Move default location of maxadmin socket to /run/maxscale

Browse Source 
MaxAdmin socket is now placed to piddir used by MaxScale.
This commit is contained in:
Marko
2018-08-02 09:31:58 +03:00
parent 56d4e5a645
commit 7ea8ff9e59
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/maxscale/maxadmin.h
View File

@ -13,10 +13,11 @@
*/
#include <maxscale/cdefs.h>
#include <maxscale/paths.h>
MXS_BEGIN_DECLS
#define MAXADMIN_DEFAULT_SOCKET "/tmp/maxadmin.sock"
#define MAXADMIN_DEFAULT_SOCKET MXS_DEFAULT_MAXADMIN_SOCKET
#define MAXADMIN_CONFIG_DEFAULT_SOCKET_TAG_LEN 7
#define MAXADMIN_CONFIG_DEFAULT_SOCKET_TAG "default"

1
include/maxscale/paths.h.in
View File

@ -45,6 +45,7 @@ MXS_BEGIN_DECLS
#define MXS_DEFAULT_CONFIG_PERSISTDIR "@DEFAULT_CONFIG_PERSISTDIR@"
#define MXS_DEFAULT_MODULE_CONFIGDIR "@DEFAULT_MODULE_CONFIGDIR@"
#define MXS_DEFAULT_CONNECTOR_PLUGINDIR "@DEFAULT_CONNECTOR_PLUGINDIR@"
#define MXS_DEFAULT_MAXADMIN_SOCKET "@DEFAULT_MAXADMIN_SOCKET@"
static const char* default_cnf_fname = "maxscale.cnf";
static const char* default_configdir = MXS_DEFAULT_CONFIGDIR;