diff options
author | onefang | 2021-08-11 19:28:05 +1000 |
---|---|---|
committer | onefang | 2021-08-11 19:28:05 +1000 |
commit | 849d76e0566d8992cf800897e06b2dcdbeb114ea (patch) | |
tree | fa9aa14100c9ebf3d79efefe767584f5b28811c1 /src/sledjchisl | |
parent | TODO++ (diff) | |
download | opensim-SC-849d76e0566d8992cf800897e06b2dcdbeb114ea.zip opensim-SC-849d76e0566d8992cf800897e06b2dcdbeb114ea.tar.gz opensim-SC-849d76e0566d8992cf800897e06b2dcdbeb114ea.tar.bz2 opensim-SC-849d76e0566d8992cf800897e06b2dcdbeb114ea.tar.xz |
Clean up some output types.
Diffstat (limited to 'src/sledjchisl')
-rw-r--r-- | src/sledjchisl/sledjchisl.c | 24 |
1 files 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) | |||
3249 | return stats; | 3249 | return stats; |
3250 | } | 3250 | } |
3251 | 3251 | ||
3252 | I("Getting fresh grid stats."); | 3252 | V("Getting fresh grid stats."); |
3253 | if (checkSimIsRunning("ROBUST")) | 3253 | if (checkSimIsRunning("ROBUST")) |
3254 | replaceStr(stats->stats, "gridOnline", "online"); | 3254 | replaceStr(stats->stats, "gridOnline", "online"); |
3255 | else | 3255 | else |
@@ -7401,7 +7401,7 @@ void sledjchisl_main(void) | |||
7401 | sigatexit(cleanup); | 7401 | sigatexit(cleanup); |
7402 | 7402 | ||
7403 | pwd = xgetcwd(); | 7403 | pwd = xgetcwd(); |
7404 | I("Running in directory %s", pwd); | 7404 | V("Running in directory %s", pwd); |
7405 | 7405 | ||
7406 | if (-1 == fstat(STDIN_FILENO, &statbuf)) | 7406 | if (-1 == fstat(STDIN_FILENO, &statbuf)) |
7407 | { | 7407 | { |
@@ -7433,19 +7433,19 @@ void sledjchisl_main(void) | |||
7433 | int ngroups; | 7433 | int ngroups; |
7434 | 7434 | ||
7435 | pw = xgetpwuid(euid); | 7435 | pw = xgetpwuid(euid); |
7436 | I("Running as user %s", pw->pw_name); | 7436 | T("Running as user %s", pw->pw_name); |
7437 | 7437 | ||
7438 | grp = xgetgrgid(egid); | 7438 | grp = xgetgrgid(egid); |
7439 | ngroups = getgroups(i, groups); | 7439 | ngroups = getgroups(i, groups); |
7440 | if (ngroups < 0) perror_exit("getgroups"); | 7440 | if (ngroups < 0) perror_exit("getgroups"); |
7441 | I("User is in group %s", grp->gr_name); | 7441 | V("User is in group %s", grp->gr_name); |
7442 | for (i = 0; i < ngroups; i++) { | 7442 | for (i = 0; i < ngroups; i++) { |
7443 | if (groups[i] != egid) | 7443 | if (groups[i] != egid) |
7444 | { | 7444 | { |
7445 | if ((grp = getgrgid(groups[i]))) | 7445 | if ((grp = getgrgid(groups[i]))) |
7446 | I("User is in group %s", grp->gr_name); | 7446 | V("User is in group %s", grp->gr_name); |
7447 | else | 7447 | else |
7448 | I("User is in group %u", groups[i]); | 7448 | V("User is in group %u", groups[i]); |
7449 | } | 7449 | } |
7450 | } | 7450 | } |
7451 | 7451 | ||
@@ -7574,11 +7574,11 @@ jit library is loaded or the JIT compiler will not be activated. | |||
7574 | snprintf(toybuf, sizeof(toybuf), "%s/%s", scRun, Tsocket); | 7574 | snprintf(toybuf, sizeof(toybuf), "%s/%s", scRun, Tsocket); |
7575 | if (((eTMUX) && (0 == strncmp(toybuf, eTMUX, strlen(toybuf))))) | 7575 | if (((eTMUX) && (0 == strncmp(toybuf, eTMUX, strlen(toybuf))))) |
7576 | { | 7576 | { |
7577 | I("Running inside the proper tmux server. %s", eTMUX); | 7577 | V("Running inside the proper tmux server. %s", eTMUX); |
7578 | isTmux = TRUE; | 7578 | isTmux = TRUE; |
7579 | } | 7579 | } |
7580 | else | 7580 | else |
7581 | I("Not running inside the proper tmux server. %s == %s", eTMUX, toybuf); | 7581 | V("Not running inside the proper tmux server. %s == %s", eTMUX, toybuf); |
7582 | } | 7582 | } |
7583 | 7583 | ||
7584 | // Note this block of code assumes we are running inside current/bin. Which RunIt.sh does for us. | 7584 | // 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. | |||
7674 | 7674 | ||
7675 | char *newPath = xmprintf("%s/current/bin/sledjchisl", scRoot); | 7675 | char *newPath = xmprintf("%s/current/bin/sledjchisl", scRoot); |
7676 | tmp = xmprintf("%s/sledjchisl", scBin); | 7676 | tmp = xmprintf("%s/sledjchisl", scBin); |
7677 | I("Symlinking %s to %s", newPath, tmp); | 7677 | V("Symlinking %s to %s", newPath, tmp); |
7678 | if (qfile_exist(tmp)) | 7678 | if (qfile_exist(tmp)) |
7679 | { | 7679 | { |
7680 | snprintf(toybuf, sizeof(toybuf), "rm %s", tmp); | 7680 | snprintf(toybuf, sizeof(toybuf), "rm %s", tmp); |
@@ -7830,7 +7830,7 @@ jit library is loaded or the JIT compiler will not be activated. | |||
7830 | ourSims->target = toys.optargs[0]; | 7830 | ourSims->target = toys.optargs[0]; |
7831 | if (2 == toys.optc) | 7831 | if (2 == toys.optc) |
7832 | ourSims->target = toys.optargs[1]; | 7832 | ourSims->target = toys.optargs[1]; |
7833 | V("ARGS - %d %d %i |%s| %s |%s|", toys.optc, toys.optflags, currentMode, toys.optargs[0], toys.optargs[1], ourSims->target); | 7833 | //V("ARGS - %d %d %i |%s| %s |%s|", toys.optc, toys.optflags, currentMode, toys.optargs[0], toys.optargs[1], ourSims->target); |
7834 | 7834 | ||
7835 | // Start ROBUST or join the tmux session, or just figure out where the sims are running in tmux. | 7835 | // Start ROBUST or join the tmux session, or just figure out where the sims are running in tmux. |
7836 | if ((START == currentMode) && !checkSimIsRunning("ROBUST")) | 7836 | if ((START == currentMode) && !checkSimIsRunning("ROBUST")) |
@@ -8066,7 +8066,7 @@ t("BODY"); | |||
8066 | free(Body); | 8066 | free(Body); |
8067 | santize(Rd->body); | 8067 | santize(Rd->body); |
8068 | 8068 | ||
8069 | I("%s %s://%s%s -> %s%s", Rd->Method, Rd->Scheme, Rd->Host, Rd->RUri, webRoot, Rd->Path); | 8069 | D("%s %s://%s%s -> %s%s", Rd->Method, Rd->Scheme, Rd->Host, Rd->RUri, webRoot, Rd->Path); |
8070 | D("Started FCGI web request ROLE = %s, body is %s bytes, pid %d.", Role, Length, getpid()); | 8070 | D("Started FCGI web request ROLE = %s, body is %s bytes, pid %d.", Role, Length, getpid()); |
8071 | 8071 | ||
8072 | if (NULL == Rd->Path) | 8072 | if (NULL == Rd->Path) |
@@ -8287,7 +8287,7 @@ fcgiDone: | |||
8287 | } | 8287 | } |
8288 | 8288 | ||
8289 | FCGI_fprintf(FCGI_stderr, "Stopped SledjChisl web server.\n"); | 8289 | FCGI_fprintf(FCGI_stderr, "Stopped SledjChisl web server.\n"); |
8290 | D("Stopped SledjChisl web server."); | 8290 | V("Stopped SledjChisl web server."); |
8291 | } | 8291 | } |
8292 | //////////////////////////////////////////////////////////////////////////////////////////////////// | 8292 | //////////////////////////////////////////////////////////////////////////////////////////////////// |
8293 | // End of web wrangling section. | 8293 | // End of web wrangling section. |