aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
authoronefang2021-09-02 13:29:10 +1000
committeronefang2021-09-02 13:29:10 +1000
commit5101caebf0c52e74d771b0b498bc2b802802b436 (patch)
tree8c5a08e145f0c1c99c299df702f3e74de03f1b08 /src
parentAlternate way of setting the tmux pane title. (diff)
downloadopensim-SC-5101caebf0c52e74d771b0b498bc2b802802b436.zip
opensim-SC-5101caebf0c52e74d771b0b498bc2b802802b436.tar.gz
opensim-SC-5101caebf0c52e74d771b0b498bc2b802802b436.tar.bz2
opensim-SC-5101caebf0c52e74d771b0b498bc2b802802b436.tar.xz
Tweak some of the error reports.
Diffstat (limited to 'src')
-rw-r--r--src/sledjchisl/sledjchisl.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/sledjchisl/sledjchisl.c b/src/sledjchisl/sledjchisl.c
index 405bcf7..3970f26 100644
--- a/src/sledjchisl/sledjchisl.c
+++ b/src/sledjchisl/sledjchisl.c
@@ -8618,7 +8618,7 @@ Create the /opt/opensim-SC directory structure.
8618. var/run HAS to be setup correctly BEFORE we try to start up tmux. 8618. var/run HAS to be setup correctly BEFORE we try to start up tmux.
8619 web // Fill it with default web stuff from current -> example.. 8619 web // Fill it with default web stuff from current -> example..
8620*/ 8620*/
8621 I("Securing directories and files in %s. This might take awhile.", scRoot); 8621 I("Securing directories and files in %s. This might take a while.", scRoot);
8622 if (shellMeFail("chmod u=rw,go= %s/config/*.ini", scRoot)) C("Can't set proper permissions for %s/config*.ini", scRoot); 8622 if (shellMeFail("chmod u=rw,go= %s/config/*.ini", scRoot)) C("Can't set proper permissions for %s/config*.ini", scRoot);
8623 if (shellMeFail("chmod u=rw,go= %s/config/ROBUST/*.ini", scRoot)) C("Can't set proper permissions for %s/config/ROBUST/*.ini", scRoot); 8623 if (shellMeFail("chmod u=rw,go= %s/config/ROBUST/*.ini", scRoot)) C("Can't set proper permissions for %s/config/ROBUST/*.ini", scRoot);
8624 if (shellMeFail("chmod u=rw,go= %s/.sledjChisl.conf.lua", scEtc)) C("Can't set proper permissions for %s/.sledjChisl.conf.lua", scEtc); 8624 if (shellMeFail("chmod u=rw,go= %s/.sledjChisl.conf.lua", scEtc)) C("Can't set proper permissions for %s/.sledjChisl.conf.lua", scEtc);
@@ -8710,24 +8710,20 @@ Create the /opt/opensim-SC directory structure.
8710 qlisttbl_t *qconfig = qconfig_parse_file(NULL, toybuf, '='); 8710 qlisttbl_t *qconfig = qconfig_parse_file(NULL, toybuf, '=');
8711 if (NULL == qconfig) 8711 if (NULL == qconfig)
8712 { 8712 {
8713 E("Can't read config file %s", toybuf); 8713 C("Can't read config file %s Perhaps you need to install things.", toybuf);
8714 goto finished; 8714 goto finished;
8715 } 8715 }
8716 d = qstrunchar(qconfig->getstr(qconfig, "Const.ConnectionString", false), '"', '"'); 8716 d = qstrunchar(qconfig->getstr(qconfig, "Const.ConnectionString", false), '"', '"');
8717 8717
8718 if (NULL == d) 8718 if (NULL == d)
8719 { 8719 {
8720 E("No database credentials in %s!", toybuf); 8720 C("No database credentials in %s!", toybuf);
8721 goto finished; 8721 goto finished;
8722 } 8722 }
8723 else 8723 else
8724 { 8724 {
8725 char *p0, *p1, *p2; 8725 char *p0, *p1, *p2;
8726 if (NULL == (d = strdup(d))) 8726 d = xstrdup(d);
8727 {
8728 E("Out of memory!");
8729 goto finished;
8730 }
8731 // Data Source=MYSQL_HOST;Database=MYSQL_DB;User ID=MYSQL_USER;Password=MYSQL_PASSWORD;Old Guids=true; 8727 // Data Source=MYSQL_HOST;Database=MYSQL_DB;User ID=MYSQL_USER;Password=MYSQL_PASSWORD;Old Guids=true;
8732 p0 = d; 8728 p0 = d;
8733 while (NULL != p0) 8729 while (NULL != p0)
@@ -8751,11 +8747,14 @@ Create the /opt/opensim-SC directory structure.
8751 8747
8752 if (mysql_library_init(toys.optc, toys.optargs, NULL)) 8748 if (mysql_library_init(toys.optc, toys.optargs, NULL))
8753 { 8749 {
8754 E("mysql_library_init() failed!"); 8750 C("mysql_library_init() failed!");
8755 goto finished; 8751 goto finished;
8756 } 8752 }
8757 if (!dbConnect()) 8753 if (!dbConnect())
8754 {
8755 C("Cannot connect to database!");
8758 goto finished; 8756 goto finished;
8757 }
8759 8758
8760 // Need to kick this off. 8759 // Need to kick this off.
8761 stats = getStats(database, stats); 8760 stats = getStats(database, stats);