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

Addition of searching rules for the gateway.cnf file. Better diagnostics for missing

Browse Source 
gatway.cnf file.

Cleanup for config reading when no modules could be found.
This commit is contained in:
Mark Riddoch
2013-06-21 17:44:49 +02:00
parent 2027f0261b
commit 0b7803a122
3 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/gateway.c
View File

@ -35,6 +35,7 @@
*/
#include <gw.h>
#include <unistd.h>
#include <service.h>
#include <server.h>
#include <dcb.h>
@ -170,7 +171,17 @@ main(int argc, char **argv)
int daemon_mode = 1;
sigset_t sigset;
int n;
char *cnf_file = "/etc/gateway.cnf";
char buf[1024], *home, *cnf_file = NULL;
if ((home = getenv("GATEWAY_HOME")) != NULL)
{
sprintf(buf, "%s/etc/gateway.cnf", home);
if (access(buf, R_OK) == 0)
cnf_file = buf;
}
if (cnf_file == NULL && access("/etc/gateway.cnf", R_OK) == 0)
cnf_file = "/etc/gateway.cnf";
for (n = 0; n < argc; n++)
@ -186,6 +197,13 @@ char *cnf_file = "/etc/gateway.cnf";
}
}
if (cnf_file == NULL)
{
fprintf(stderr, "Unable to find a gateway configuration file, either install one in\n");
fprintf(stderr, "/etc/gateway.cnf, $GATEWAY_HOME/etc/gateway.cnf or use the -c option.\n");
exit(1);
}
if (!load_config(cnf_file))
{
fprintf(stderr, "Failed to load gateway configuration file %s\n", cnf_file);