From 5101caebf0c52e74d771b0b498bc2b802802b436 Mon Sep 17 00:00:00 2001
From: onefang
Date: Thu, 2 Sep 2021 13:29:10 +1000
Subject: Tweak some of the error reports.

---
 src/sledjchisl/sledjchisl.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'src/sledjchisl/sledjchisl.c')

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.
 .	var/run			HAS to be setup correctly BEFORE we try to start up tmux.
 	web			// Fill it with default web stuff from current -> example..
 */
-      I("Securing directories and files in %s.  This might take awhile.", scRoot);
+      I("Securing directories and files in %s.  This might take a while.", scRoot);
       if (shellMeFail("chmod	u=rw,go=	%s/config/*.ini",			scRoot))	C("Can't set proper permissions for %s/config*.ini",			scRoot);
       if (shellMeFail("chmod	u=rw,go=	%s/config/ROBUST/*.ini",		scRoot))	C("Can't set proper permissions for %s/config/ROBUST/*.ini",		scRoot);
       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.
     qlisttbl_t *qconfig = qconfig_parse_file(NULL, toybuf, '=');
     if (NULL == qconfig)
     {
-      E("Can't read config file %s", toybuf);
+      C("Can't read config file %s  Perhaps you need to install things.", toybuf);
       goto finished;
     }
     d = qstrunchar(qconfig->getstr(qconfig, "Const.ConnectionString", false), '"', '"');
 
     if (NULL == d)
     {
-      E("No database credentials in %s!", toybuf);
+      C("No database credentials in %s!", toybuf);
       goto finished;
     }
     else
     {
       char *p0, *p1, *p2;
-      if (NULL == (d = strdup(d)))
-      {
-        E("Out of memory!");
-        goto finished;
-      }
+      d = xstrdup(d);
       // Data Source=MYSQL_HOST;Database=MYSQL_DB;User ID=MYSQL_USER;Password=MYSQL_PASSWORD;Old Guids=true;
       p0 = d;
       while (NULL != p0)
@@ -8751,11 +8747,14 @@ Create the /opt/opensim-SC directory structure.
 
     if (mysql_library_init(toys.optc, toys.optargs, NULL))
     {
-      E("mysql_library_init() failed!");
+      C("mysql_library_init() failed!");
       goto finished;
     }
     if (!dbConnect())
+    {
+      C("Cannot connect to database!");
       goto finished;
+    }
 
     // Need to kick this off.
     stats = getStats(database, stats);
-- 
cgit v1.1