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

Updated packaging install layout, moved some cmake files around.

Browse Source
This commit is contained in:
Markus Makela
2015-04-26 06:21:28 +03:00
parent df9bc65430
commit ed426ca30d
7 changed files with 61 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/core/gateway.c
View File

@ -1276,6 +1276,7 @@ int main(int argc, char **argv)
{
moduledir = tmp_path;
}
break;
case 'A':
if(handle_path_arg(&tmp_path,optarg,NULL,true,true))
{
@ -1739,7 +1740,6 @@ int main(int argc, char **argv)
if(cachedir == NULL)
cachedir = strdup(default_cachedir);
if(langdir == NULL)
langdir = strdup(default_langdir);
if(moduledir == NULL)
@ -1780,11 +1780,13 @@ int main(int argc, char **argv)
"Configuration file : %s\n"
"Log directory : %s\n"
"Data directory : %s\n"
"Module directory : %s\n\n",
"Module directory : %s\n"
"Service cache : %s\n\n",
cnf_file_path,
logdir,
datadir,
moduledir);
moduledir,
cachedir);
}
LOGIF(LM,
@ -1806,6 +1808,10 @@ int main(int argc, char **argv)
(skygw_log_write_flush(LOGFILE_MESSAGE,
"Module directory: %s",
moduledir)));
LOGIF(LM,
(skygw_log_write_flush(LOGFILE_MESSAGE,
"Service cache: %s",
cachedir)));
/*< Update the server options */
for (i = 0; server_options[i]; i++)
@ -1882,7 +1888,7 @@ int main(int argc, char **argv)
if (!config_load(cnf_file_path))
{
char* fprerr = "Failed to load MaxScale configuration "
"file. Exiting.";
"file. Exiting. See the error log for details.";
print_log_n_stderr(false, !daemon_mode, fprerr, fprerr, 0);
LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR,

8
server/core/service.c
View File

@ -61,6 +61,7 @@
#include <sys/types.h>
#include <housekeeper.h>
#include <resultset.h>
#include <gw.h>
/** Defined in log_manager.cc */
extern int lm_enabled_logfiles_bitmask;
@ -112,7 +113,7 @@ SERVICE *service;
return NULL;
if ((service->router = load_module(router, MODULE_ROUTER)) == NULL)
{
char* home = get_maxscale_home();
char* home = get_moduledir();
char* ldpath = getenv("LD_LIBRARY_PATH");
LOGIF(LE, (skygw_log_write_flush(
@ -120,12 +121,13 @@ SERVICE *service;
"Error : Unable to load %s module \"%s\".\n\t\t\t"
" Ensure that lib%s.so exists in one of the "
"following directories :\n\t\t\t "
"- %s/modules\n\t\t\t - %s",
"- %s/modules\n%s%s",
MODULE_ROUTER,
router,
router,
home,
ldpath)));
ldpath?"\t\t\t - ":"",
ldpath?ldpath:"")));
free(service);
return NULL;
}