From a602e74ad44e087056051643dcb7d64e7c7f3e50 Mon Sep 17 00:00:00 2001 From: onefang Date: Fri, 6 Aug 2021 05:56:21 +1000 Subject: Add VERBOSE level logging output. --- src/sledjchisl/sledjchisl.c | 110 +++++++++++++++++++++++--------------------- 1 file changed, 58 insertions(+), 52 deletions(-) (limited to 'src/sledjchisl') diff --git a/src/sledjchisl/sledjchisl.c b/src/sledjchisl/sledjchisl.c index 02b5d0c..62eb928 100644 --- a/src/sledjchisl/sledjchisl.c +++ b/src/sledjchisl/sledjchisl.c @@ -503,6 +503,7 @@ float loadAverageInc = 0.7; int simTimeOut = 45; int bulkSims = 0; boolean DEBUG = FALSE; +boolean VERBOSE = TRUE; qhashtbl_t *mimeTypes; qlist_t *dbRequests; @@ -523,8 +524,9 @@ char *logTypes[] = "93", "WARNING", // yellow "36", "TIMEOUT", // cyan "97;40", "INFO", // white + "92;40", "VERBOSE", // green "90", "DEBUG", // grey -// VERBOSE? UNKNOWN? FATAL? SILENT? All from Android apparently. +// UNKNOWN? FATAL? SILENT? All from Android apparently. "35", "debug", // magenta "34", "timeout", // blue }; @@ -539,7 +541,9 @@ void logMe(int v, char *format, ...) time_t curtime; char date[DATE_TIME_LEN]; - if ((!DEBUG) && (4 < v)) + if ((!VERBOSE) && (4 < v)) + return; + if ((!DEBUG) && (5 < v)) return; va_start(va, format); @@ -566,9 +570,10 @@ void logMe(int v, char *format, ...) #define W(...) logMe(2, __VA_ARGS__) #define T(...) logMe(3, __VA_ARGS__) #define I(...) logMe(4, __VA_ARGS__) -#define D(...) logMe(5, __VA_ARGS__) -#define d(...) logMe(6, __VA_ARGS__) -#define t(...) logMe(7, __VA_ARGS__) +#define V(...) logMe(5, __VA_ARGS__) +#define D(...) logMe(6, __VA_ARGS__) +#define d(...) logMe(7, __VA_ARGS__) +#define t(...) logMe(8, __VA_ARGS__) static void addStrL(qlist_t *list, char *s) @@ -2321,7 +2326,7 @@ I("count!!!!!!!!!!!!!!!!"); signed char d = (signed char) c; memcpy(req->inBind[i].buffer, &d, (size_t) fld->length); -//T("TINY %d %s %d", i, fld->name, req->inBind[i].buffer_length); +//V("TINY %d %s %d", i, fld->name, req->inBind[i].buffer_length); break; } @@ -2331,7 +2336,7 @@ I("count!!!!!!!!!!!!!!!!"); short int d = (short int) c; memcpy(req->inBind[i].buffer, &d, (size_t) fld->length); -//T("SHORT %d %s %d = %d", i, fld->name, req->inBind[i].buffer_length, c); +//V("SHORT %d %s %d = %d", i, fld->name, req->inBind[i].buffer_length, c); break; } @@ -2340,7 +2345,7 @@ I("count!!!!!!!!!!!!!!!!"); int d = va_arg(ap, int); memcpy(req->inBind[i].buffer, &d, (size_t) fld->length); -//T("INT24 %d %s %d - %d", i, fld->name, req->inBind[i].buffer_length, d); +//V("INT24 %d %s %d - %d", i, fld->name, req->inBind[i].buffer_length, d); break; } @@ -2349,7 +2354,7 @@ I("count!!!!!!!!!!!!!!!!"); long d = va_arg(ap, long); memcpy(req->inBind[i].buffer, &d, (size_t) fld->length); -//T("LONG %d %s %d = %ld", i, fld->name, req->inBind[i].buffer_length, d); +//V("LONG %d %s %d = %ld", i, fld->name, req->inBind[i].buffer_length, d); break; } @@ -2358,7 +2363,7 @@ I("count!!!!!!!!!!!!!!!!"); long long int d = va_arg(ap, long long int); memcpy(req->inBind[i].buffer, &d, (size_t) fld->length); -//T("LONGLONG %d %s %d = %lld", i, fld->name, req->inBind[i].buffer_length, d); +//V("LONGLONG %d %s %d = %lld", i, fld->name, req->inBind[i].buffer_length, d); break; } @@ -2368,7 +2373,7 @@ I("count!!!!!!!!!!!!!!!!"); float d = (float) c; memcpy(req->inBind[i].buffer, &d, (size_t) fld->length); -//T("FLOAT %d %s %d = %f", i, fld->name, req->inBind[i].buffer_length, d); +//V("FLOAT %d %s %d = %f", i, fld->name, req->inBind[i].buffer_length, d); break; } @@ -2377,13 +2382,13 @@ I("count!!!!!!!!!!!!!!!!"); double d = va_arg(ap, double); memcpy(req->inBind[i].buffer, &d, (size_t) fld->length); -//T("DOUBLE %d %s %d = %f", i, fld->name, req->inBind[i].buffer_length, d); +//V("DOUBLE %d %s %d = %f", i, fld->name, req->inBind[i].buffer_length, d); break; } case MYSQL_TYPE_NEWDECIMAL: { -//T("NEWDECIMAL %d %s %d", i, fld->name, req->inBind[i].buffer_length); +//V("NEWDECIMAL %d %s %d", i, fld->name, req->inBind[i].buffer_length); break; } @@ -2395,7 +2400,7 @@ I("count!!!!!!!!!!!!!!!!"); MYSQL_TIME d = va_arg(ap, MYSQL_TIME); memcpy(req->inBind[i].buffer, &d, (size_t) fld->length); -//T("DATE / TIME ish %d %s %d", i, fld->name, req->inBind[i].buffer_length); +//V("DATE / TIME ish %d %s %d", i, fld->name, req->inBind[i].buffer_length); break; } @@ -2410,7 +2415,7 @@ I("count!!!!!!!!!!!!!!!!"); *(req->inBind[i].length) = l; strncpy(req->inBind[i].buffer, d, (size_t) l); ((char *) req->inBind[i].buffer)[l] = '\0'; -//T("STRING / VARSTRING %d %s %d = %s", i, fld->name, req->inBind[i].buffer_length, d); +//V("STRING / VARSTRING %d %s %d = %s", i, fld->name, req->inBind[i].buffer_length, d); break; } @@ -2420,19 +2425,19 @@ I("count!!!!!!!!!!!!!!!!"); case MYSQL_TYPE_LONG_BLOB: { // TODO - should write this, we will likely need it. Main problem is - how long is this blob? Probably should add a length param before the blob. -//T("BLOBs %d %s %d", i, fld->name, req->inBind[i].buffer_length); +//V("BLOBs %d %s %d", i, fld->name, req->inBind[i].buffer_length); break; } case MYSQL_TYPE_BIT: { -//T("BIT %d %s %d", i, fld->name, req->inBind[i].buffer_length); +//V("BIT %d %s %d", i, fld->name, req->inBind[i].buffer_length); break; } case MYSQL_TYPE_NULL: { -//T("NULL %d %s %d", i, fld->name, req->inBind[i].buffer_length); +//V("NULL %d %s %d", i, fld->name, req->inBind[i].buffer_length); break; } } @@ -5731,7 +5736,7 @@ d("accountRead() UUID %s, name %s %s", uuid, first, last); if (0 == rt) { -T("Found Lua record."); +V("Found Lua record."); ret += 1; Rd->database->putstr(Rd->database, "UserAccounts.FirstName", first); Rd->database->putstr(Rd->database, "UserAccounts.LastName", last); @@ -5761,7 +5766,7 @@ T("Found Lua record."); if (1 == rt) { ret = rt; -T("Found database record."); +V("Found database record."); dbPull(Rd, "UserAccounts", rows); char *name = xmprintf("%s %s", getStrH(Rd->database, "UserAccounts.FirstName"), getStrH(Rd->database, "UserAccounts.LastName")); @@ -6933,20 +6938,21 @@ void sledjchisl_main(void) int status, result, i; void *vd; + V("SledjChisl arguments - %d %d", toys.optc, toys.optflags); + for (i = 0; i < toys.optc; i++) + V(" argument %d %s", i, toys.optargs[i] ); + configs = qhashtbl(0, 0); L = luaL_newstate(); - I("libfcgi version: %s", FCGI_VERSION); - I("Lua version: %s", LUA_RELEASE); - I("LuaJIT version: %s", LUAJIT_VERSION); - I("MariaDB / MySQL client version: %s", mysql_get_client_info()); - I("OpenSSL version: %s", OPENSSL_VERSION_TEXT); - I("qLibc version: qLibc only git tags for version numbers. Sooo, 2.4.4, unless I forgot to update this."); - I("toybox version: %s", TOYBOX_VERSION); + V("libfcgi version: %s", FCGI_VERSION); + V("Lua version: %s", LUA_RELEASE); + V("LuaJIT version: %s", LUAJIT_VERSION); + V("MariaDB / MySQL client version: %s", mysql_get_client_info()); + V("OpenSSL version: %s", OPENSSL_VERSION_TEXT); + V("qLibc version: qLibc only git tags for version numbers. Sooo, 2.4.4, unless I forgot to update this."); + V("toybox version: %s", TOYBOX_VERSION); - t("SledjChisl arguments %d %d", (int)toys.optflags, (int)toys.optc); - for (i = 0; i < toys.optc; i++) - T(" argument %d %s", i, toys.optargs[i] ); dbRequests = qlist(0); sigatexit(cleanup); @@ -7074,24 +7080,24 @@ jit library is loaded or the JIT compiler will not be activated. } } DEBUG = configs->getint(configs, "debug"); - I("Setting DEBUG = %d", DEBUG); - if ((vd = configs->get (configs, "loadAverageInc", NULL, false)) != NULL) {loadAverageInc = *((float *) vd); T("Setting loadAverageInc = %f", loadAverageInc);} - if ((vd = configs->get (configs, "simTimeOut", NULL, false)) != NULL) {simTimeOut = (int) *((float *) vd); T("Setting simTimeOut = %d", simTimeOut);} - if ((vd = configs->get (configs, "bulkSims", NULL, false)) != NULL) {bulkSims = (int) *((float *) vd); T("Setting bulkSims = %d", bulkSims);} - if ((tmp = configs->getstr(configs, "scRoot", false)) != NULL) {scRoot = tmp; T("Setting scRoot = %s", scRoot);} - if ((tmp = configs->getstr(configs, "scUser", false)) != NULL) {scUser = tmp; T("Setting scUser = %s", scUser);} - if ((tmp = configs->getstr(configs, "Tconsole", false)) != NULL) {Tconsole = tmp; T("Setting Tconsole = %s", Tconsole);} - if ((tmp = configs->getstr(configs, "Tsocket", false)) != NULL) {Tsocket = tmp; T("Setting Tsocket = %s", Tsocket);} - if ((tmp = configs->getstr(configs, "Ttab", false)) != NULL) {Ttab = tmp; T("Setting Ttab = %s", Ttab);} - if ((tmp = configs->getstr(configs, "backupIARsim", false)) != NULL) {backupIARsim = tmp; T("Setting backupIARsim = %s", backupIARsim);} - if ((tmp = configs->getstr(configs, "webRoot", false)) != NULL) {webRoot = tmp; T("Setting webRoot = %s", webRoot);} - if ((tmp = configs->getstr(configs, "URL", false)) != NULL) {URL = tmp; T("Setting URL = %s", URL);} - if ((vd = configs->get (configs, "seshRenew", NULL, false)) != NULL) {seshRenew = (int) *((float *) vd); T("Setting seshRenew = %d", seshRenew);} - if ((vd = configs->get (configs, "idleTimeOut", NULL, false)) != NULL) {idleTimeOut = (int) *((float *) vd); T("Setting idleTimeOut = %d", idleTimeOut);} - if ((vd = configs->get (configs, "seshTimeOut", NULL, false)) != NULL) {seshTimeOut = (int) *((float *) vd); T("Setting seshTimeOut = %d", seshTimeOut);} - if ((vd = configs->get (configs, "newbieTimeOut", NULL, false)) != NULL) {newbieTimeOut = (int) *((float *) vd); T("Setting newbieTimeOut = %d", newbieTimeOut);} - if ((tmp = configs->getstr(configs, "ToS", false)) != NULL) {ToS = tmp; T("Setting ToS = %s", ToS);} - if ((tmp = configs->getstr(configs, "webIframers", false)) != NULL) {webIframers = tmp; T("Setting webIframers = %s", webIframers);} + V("Setting DEBUG = %d", DEBUG); + if ((vd = configs->get (configs, "loadAverageInc", NULL, false)) != NULL) {loadAverageInc = *((float *) vd); V("Setting loadAverageInc = %f", loadAverageInc);} + if ((vd = configs->get (configs, "simTimeOut", NULL, false)) != NULL) {simTimeOut = (int) *((float *) vd); V("Setting simTimeOut = %d", simTimeOut);} + if ((vd = configs->get (configs, "bulkSims", NULL, false)) != NULL) {bulkSims = (int) *((float *) vd); V("Setting bulkSims = %d", bulkSims);} + if ((tmp = configs->getstr(configs, "scRoot", false)) != NULL) {scRoot = tmp; V("Setting scRoot = %s", scRoot);} + if ((tmp = configs->getstr(configs, "scUser", false)) != NULL) {scUser = tmp; V("Setting scUser = %s", scUser);} + if ((tmp = configs->getstr(configs, "Tconsole", false)) != NULL) {Tconsole = tmp; V("Setting Tconsole = %s", Tconsole);} + if ((tmp = configs->getstr(configs, "Tsocket", false)) != NULL) {Tsocket = tmp; V("Setting Tsocket = %s", Tsocket);} + if ((tmp = configs->getstr(configs, "Ttab", false)) != NULL) {Ttab = tmp; V("Setting Ttab = %s", Ttab);} + if ((tmp = configs->getstr(configs, "backupIARsim", false)) != NULL) {backupIARsim = tmp; V("Setting backupIARsim = %s", backupIARsim);} + if ((tmp = configs->getstr(configs, "webRoot", false)) != NULL) {webRoot = tmp; V("Setting webRoot = %s", webRoot);} + if ((tmp = configs->getstr(configs, "URL", false)) != NULL) {URL = tmp; V("Setting URL = %s", URL);} + if ((vd = configs->get (configs, "seshRenew", NULL, false)) != NULL) {seshRenew = (int) *((float *) vd); V("Setting seshRenew = %d", seshRenew);} + if ((vd = configs->get (configs, "idleTimeOut", NULL, false)) != NULL) {idleTimeOut = (int) *((float *) vd); V("Setting idleTimeOut = %d", idleTimeOut);} + if ((vd = configs->get (configs, "seshTimeOut", NULL, false)) != NULL) {seshTimeOut = (int) *((float *) vd); V("Setting seshTimeOut = %d", seshTimeOut);} + if ((vd = configs->get (configs, "newbieTimeOut", NULL, false)) != NULL) {newbieTimeOut = (int) *((float *) vd); V("Setting newbieTimeOut = %d", newbieTimeOut);} + if ((tmp = configs->getstr(configs, "ToS", false)) != NULL) {ToS = tmp; V("Setting ToS = %s", ToS);} + if ((tmp = configs->getstr(configs, "webIframers", false)) != NULL) {webIframers = tmp; V("Setting webIframers = %s", webIframers);} //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -7213,7 +7219,7 @@ jit library is loaded or the JIT compiler will not be activated. // toybox argument parsing is half working. if ((NULL == toys.optargs[0]) || (('-' != toys.optargs[0][0]) && ('q' != toys.optargs[0][1]))) { - T("Joining the session."); + V("Joining the session."); // Join the session. memset(toybuf, 0, sizeof(toybuf)); snprintf(toybuf, sizeof(toybuf), "%s %s/%s select-window -t '%s' \\; attach-session -t '%s'", Tcmd, scRun, Tsocket, Tconsole, Tconsole); @@ -7222,7 +7228,7 @@ jit library is loaded or the JIT compiler will not be activated. E("tmux attach-session command failed! %s", toybuf); } else - T("NOT joining the session."); + V("NOT joining the session."); goto finished; } } @@ -7843,7 +7849,7 @@ fcgiDone: window++; } - T("Prepping sims of type %s, window %d, %d panes per window.", type, window, panes); + V("Prepping sims of type %s, window %d, %d panes per window.", type, window, panes); memset((void*)&obj1, 0, sizeof(obj1)); q0->v.t->lock(q0->v.t); @@ -8059,7 +8065,7 @@ fcgiDone: window++; } - T("Doing sims of type %s, window %d, %d panes per window.", type, window, panes); + V("Doing sims of type %s, window %d, %d panes per window.", type, window, panes); memset((void*)&obj1, 0, sizeof(obj1)); q0->v.t->lock(q0->v.t); while(q0->v.t->getnext(q0->v.t, &obj1, false) == true) -- cgit v1.1