aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/sledjchisl
diff options
context:
space:
mode:
authoronefang2020-03-17 10:02:01 +1000
committeronefang2020-03-17 10:02:01 +1000
commit7ccd5107456748ee546ee7f5192d4b18c0bc6b7c (patch)
tree8aa2ca20cbcd6c4e91926853b16b58214b969d3f /src/sledjchisl
parentUpdate list of dependencies. (diff)
downloadopensim-SC-7ccd5107456748ee546ee7f5192d4b18c0bc6b7c.zip
opensim-SC-7ccd5107456748ee546ee7f5192d4b18c0bc6b7c.tar.gz
opensim-SC-7ccd5107456748ee546ee7f5192d4b18c0bc6b7c.tar.bz2
opensim-SC-7ccd5107456748ee546ee7f5192d4b18c0bc6b7c.tar.xz
Load the local config file first, then let it be overridden by system and home config files.
Also log the loaded config file when doing web stuff as well.
Diffstat (limited to 'src/sledjchisl')
-rw-r--r--src/sledjchisl/sledjchisl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sledjchisl/sledjchisl.c b/src/sledjchisl/sledjchisl.c
index b5dfc97..6acd4a8 100644
--- a/src/sledjchisl/sledjchisl.c
+++ b/src/sledjchisl/sledjchisl.c
@@ -4385,11 +4385,11 @@ jit library is loaded or the JIT compiler will not be activated.
4385 // Load the config scripts. 4385 // Load the config scripts.
4386 char *cPaths[] = 4386 char *cPaths[] =
4387 { 4387 {
4388 ".sledjChisl.conf.lua",
4388 "/etc/sledjChisl.conf.lua", 4389 "/etc/sledjChisl.conf.lua",
4389// "/etc/sledjChisl.d/*.lua", 4390// "/etc/sledjChisl.d/*.lua",
4390 "~/.sledjChisl.conf.lua", 4391 "~/.sledjChisl.conf.lua",
4391// "~/.config/sledjChisl/*.lua", 4392// "~/.config/sledjChisl/*.lua",
4392 ".sledjChisl.conf.lua",
4393 NULL 4393 NULL
4394 }; 4394 };
4395 struct stat st; 4395 struct stat st;
@@ -4404,7 +4404,7 @@ jit library is loaded or the JIT compiler will not be activated.
4404 snprintf(toybuf, sizeof(toybuf), "%s/%s", pwd, cPaths[i]); 4404 snprintf(toybuf, sizeof(toybuf), "%s/%s", pwd, cPaths[i]);
4405 if (0 != lstat(toybuf, &st)) 4405 if (0 != lstat(toybuf, &st))
4406 continue; 4406 continue;
4407 if (!isWeb) I("Loading configuration file - %s", toybuf); 4407 I("Loading configuration file - %s", toybuf);
4408 status = luaL_loadfile(L, toybuf); 4408 status = luaL_loadfile(L, toybuf);
4409 if (status) // If something went wrong, error message is at the top of the stack. 4409 if (status) // If something went wrong, error message is at the top of the stack.
4410 E("Couldn't load file: %s", lua_tostring(L, -1)); 4410 E("Couldn't load file: %s", lua_tostring(L, -1));