From 849d76e0566d8992cf800897e06b2dcdbeb114ea Mon Sep 17 00:00:00 2001 From: onefang Date: Wed, 11 Aug 2021 19:28:05 +1000 Subject: Clean up some output types. --- src/sledjchisl/sledjchisl.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/sledjchisl/sledjchisl.c b/src/sledjchisl/sledjchisl.c index d1c57ff..850a0c7 100644 --- a/src/sledjchisl/sledjchisl.c +++ b/src/sledjchisl/sledjchisl.c @@ -3249,7 +3249,7 @@ gridStats *getStats(MYSQL *db, gridStats *stats) return stats; } - I("Getting fresh grid stats."); + V("Getting fresh grid stats."); if (checkSimIsRunning("ROBUST")) replaceStr(stats->stats, "gridOnline", "online"); else @@ -7401,7 +7401,7 @@ void sledjchisl_main(void) sigatexit(cleanup); pwd = xgetcwd(); - I("Running in directory %s", pwd); + V("Running in directory %s", pwd); if (-1 == fstat(STDIN_FILENO, &statbuf)) { @@ -7433,19 +7433,19 @@ void sledjchisl_main(void) int ngroups; pw = xgetpwuid(euid); - I("Running as user %s", pw->pw_name); + T("Running as user %s", pw->pw_name); grp = xgetgrgid(egid); ngroups = getgroups(i, groups); if (ngroups < 0) perror_exit("getgroups"); - I("User is in group %s", grp->gr_name); + V("User is in group %s", grp->gr_name); for (i = 0; i < ngroups; i++) { if (groups[i] != egid) { if ((grp = getgrgid(groups[i]))) - I("User is in group %s", grp->gr_name); + V("User is in group %s", grp->gr_name); else - I("User is in group %u", groups[i]); + V("User is in group %u", groups[i]); } } @@ -7574,11 +7574,11 @@ jit library is loaded or the JIT compiler will not be activated. snprintf(toybuf, sizeof(toybuf), "%s/%s", scRun, Tsocket); if (((eTMUX) && (0 == strncmp(toybuf, eTMUX, strlen(toybuf))))) { - I("Running inside the proper tmux server. %s", eTMUX); + V("Running inside the proper tmux server. %s", eTMUX); isTmux = TRUE; } else - I("Not running inside the proper tmux server. %s == %s", eTMUX, toybuf); + V("Not running inside the proper tmux server. %s == %s", eTMUX, toybuf); } // Note this block of code assumes we are running inside current/bin. Which RunIt.sh does for us. @@ -7674,7 +7674,7 @@ jit library is loaded or the JIT compiler will not be activated. char *newPath = xmprintf("%s/current/bin/sledjchisl", scRoot); tmp = xmprintf("%s/sledjchisl", scBin); - I("Symlinking %s to %s", newPath, tmp); + V("Symlinking %s to %s", newPath, tmp); if (qfile_exist(tmp)) { snprintf(toybuf, sizeof(toybuf), "rm %s", tmp); @@ -7830,7 +7830,7 @@ jit library is loaded or the JIT compiler will not be activated. ourSims->target = toys.optargs[0]; if (2 == toys.optc) ourSims->target = toys.optargs[1]; -V("ARGS - %d %d %i |%s| %s |%s|", toys.optc, toys.optflags, currentMode, toys.optargs[0], toys.optargs[1], ourSims->target); +//V("ARGS - %d %d %i |%s| %s |%s|", toys.optc, toys.optflags, currentMode, toys.optargs[0], toys.optargs[1], ourSims->target); // Start ROBUST or join the tmux session, or just figure out where the sims are running in tmux. if ((START == currentMode) && !checkSimIsRunning("ROBUST")) @@ -8066,7 +8066,7 @@ t("BODY"); free(Body); santize(Rd->body); - I("%s %s://%s%s -> %s%s", Rd->Method, Rd->Scheme, Rd->Host, Rd->RUri, webRoot, Rd->Path); + D("%s %s://%s%s -> %s%s", Rd->Method, Rd->Scheme, Rd->Host, Rd->RUri, webRoot, Rd->Path); D("Started FCGI web request ROLE = %s, body is %s bytes, pid %d.", Role, Length, getpid()); if (NULL == Rd->Path) @@ -8287,7 +8287,7 @@ fcgiDone: } FCGI_fprintf(FCGI_stderr, "Stopped SledjChisl web server.\n"); - D("Stopped SledjChisl web server."); + V("Stopped SledjChisl web server."); } //////////////////////////////////////////////////////////////////////////////////////////////////// // End of web wrangling section. -- cgit v1.1