aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authoronefang2022-03-18 21:06:49 +1000
committeronefang2022-03-18 21:06:49 +1000
commit0fa1dd560d0a17f5de3a267317d9d237337d7d7f (patch)
treea75f5b085324623dd1669c1285cbe88bbee02eab
parentMerge branch 'Domme' of ssh://sledjhamr.org/var/lib/cgit/opensim-SC into Domme (diff)
downloadopensim-SC-0fa1dd560d0a17f5de3a267317d9d237337d7d7f.zip
opensim-SC-0fa1dd560d0a17f5de3a267317d9d237337d7d7f.tar.gz
opensim-SC-0fa1dd560d0a17f5de3a267317d9d237337d7d7f.tar.bz2
opensim-SC-0fa1dd560d0a17f5de3a267317d9d237337d7d7f.tar.xz
Tweak logging and whitespace.
Diffstat
-rw-r--r--src/sledjchisl/sledjchisl.c52
1 files changed, 26 insertions, 26 deletions
diff --git a/src/sledjchisl/sledjchisl.c b/src/sledjchisl/sledjchisl.c
index 673b576..a824f83 100644
--- a/src/sledjchisl/sledjchisl.c
+++ b/src/sledjchisl/sledjchisl.c
@@ -2178,7 +2178,7 @@ void findSimsTmux(simData *simd, char *sim, char *type, int count, int window, i
2178 qtreetbl_t *IDs = Lua2tree(toybuf, "IDs"); 2178 qtreetbl_t *IDs = Lua2tree(toybuf, "IDs");
2179 snprintf(toybuf, sizeof(toybuf), "%d %d", window, pane); 2179 snprintf(toybuf, sizeof(toybuf), "%d %d", window, pane);
2180 simd->paneID = xmprintf("%s", qLuaGet(IDs, toybuf)->v.s); 2180 simd->paneID = xmprintf("%s", qLuaGet(IDs, toybuf)->v.s);
2181V("findSimsTmux -> paneID %s -> %s", sim, simd->paneID); 2181d("findSimsTmux -> paneID %s -> %s", sim, simd->paneID);
2182 freeLuaTree(IDs); 2182 freeLuaTree(IDs);
2183} 2183}
2184 2184
@@ -2358,7 +2358,7 @@ TODO -
2358 2358
2359 // Look for ancient ones first. 2359 // Look for ancient ones first.
2360 char *fullName = NULL; 2360 char *fullName = NULL;
2361 2361
2362 if (m) 2362 if (m)
2363 { 2363 {
2364 if (member) 2364 if (member)
@@ -2815,10 +2815,10 @@ byTab has the short name as the key, simData as the value.
2815 sendTmuxCmd(simd->paneID, ""); 2815 sendTmuxCmd(simd->paneID, "");
2816 if ('\0' != rSync[0]) 2816 if ('\0' != rSync[0])
2817 { 2817 {
2818 I("%s is rsyncing.", simd->name); 2818 I("%s is rsyncing.", simd->name);
2819 if (shellMeFail("ionice -c3 nice -n 19 rsync -Ha -R --modify-window=2 -P --port=%d --remove-source-files %s/*.oar %s", 2819 if (shellMeFail("ionice -c3 nice -n 19 rsync -Ha -R --modify-window=2 -P --port=%d --remove-source-files %s/*.oar %s",
2820 rSyncPort, scBackup, rSync)) 2820 rSyncPort, scBackup, rSync))
2821 E("rsync failed"); 2821 E("rsync failed");
2822 I("%s is done rsyncing.", simd->name); 2822 I("%s is done rsyncing.", simd->name);
2823 } 2823 }
2824 ourSims->la = waitLoadAverage(ourSims->la, loadAverageInc, simTimeOut); 2824 ourSims->la = waitLoadAverage(ourSims->la, loadAverageInc, simTimeOut);
@@ -8530,26 +8530,26 @@ int scanForConfigs(char **cPaths)
8530 Lua2hashtbl(toybuf, configs, "config"); 8530 Lua2hashtbl(toybuf, configs, "config");
8531 DEBUG = configs->getint(configs, "debug"); 8531 DEBUG = configs->getint(configs, "debug");
8532 V("Setting DEBUG = %d", DEBUG); 8532 V("Setting DEBUG = %d", DEBUG);
8533 if ((vd = configs->get (configs, "loadAverageInc", NULL, false)) != NULL) {loadAverageInc = *((float *) vd); V("Setting loadAverageInc = %f", loadAverageInc);} 8533 if ((vd = configs->get (configs, "loadAverageInc", NULL, false)) != NULL) {loadAverageInc = *((float *) vd); D("Setting loadAverageInc = %f", loadAverageInc);}
8534 if ((vd = configs->get (configs, "simTimeOut", NULL, false)) != NULL) {simTimeOut = (int) *((float *) vd); V("Setting simTimeOut = %d", simTimeOut);} 8534 if ((vd = configs->get (configs, "simTimeOut", NULL, false)) != NULL) {simTimeOut = (int) *((float *) vd); D("Setting simTimeOut = %d", simTimeOut);}
8535 if ((vd = configs->get (configs, "bulkSims", NULL, false)) != NULL) {bulkSims = (int) *((float *) vd); V("Setting bulkSims = %d", bulkSims);} 8535 if ((vd = configs->get (configs, "bulkSims", NULL, false)) != NULL) {bulkSims = (int) *((float *) vd); D("Setting bulkSims = %d", bulkSims);}
8536 if ((tmp = configs->getstr(configs, "scRoot", false)) != NULL) {scRoot = tmp; V("Setting scRoot = %s", scRoot);} 8536 if ((tmp = configs->getstr(configs, "scRoot", false)) != NULL) {scRoot = tmp; D("Setting scRoot = %s", scRoot);}
8537 if ((tmp = configs->getstr(configs, "scUser", false)) != NULL) {scUser = tmp; V("Setting scUser = %s", scUser);} 8537 if ((tmp = configs->getstr(configs, "scUser", false)) != NULL) {scUser = tmp; D("Setting scUser = %s", scUser);}
8538 if ((tmp = configs->getstr(configs, "Tconsole", false)) != NULL) {Tconsole = tmp; V("Setting Tconsole = %s", Tconsole);} 8538 if ((tmp = configs->getstr(configs, "Tconsole", false)) != NULL) {Tconsole = tmp; D("Setting Tconsole = %s", Tconsole);}
8539 if ((tmp = configs->getstr(configs, "Tsocket", false)) != NULL) {Tsocket = tmp; V("Setting Tsocket = %s", Tsocket);} 8539 if ((tmp = configs->getstr(configs, "Tsocket", false)) != NULL) {Tsocket = tmp; D("Setting Tsocket = %s", Tsocket);}
8540 if ((tmp = configs->getstr(configs, "Ttab", false)) != NULL) {Ttab = tmp; V("Setting Ttab = %s", Ttab);} 8540 if ((tmp = configs->getstr(configs, "Ttab", false)) != NULL) {Ttab = tmp; D("Setting Ttab = %s", Ttab);}
8541 if ((vd = configs->get (configs, "startPort", NULL, false)) != NULL) {startPort = (int) *((float *) vd); V("Setting startPort = %d", startPort);} 8541 if ((vd = configs->get (configs, "startPort", NULL, false)) != NULL) {startPort = (int) *((float *) vd); D("Setting startPort = %d", startPort);}
8542 if ((tmp = configs->getstr(configs, "backupIARsim", false)) != NULL) {backupIARsim = tmp; V("Setting backupIARsim = %s", backupIARsim);} 8542 if ((tmp = configs->getstr(configs, "backupIARsim", false)) != NULL) {backupIARsim = tmp; D("Setting backupIARsim = %s", backupIARsim);}
8543 if ((tmp = configs->getstr(configs, "rsync", false)) != NULL) {rSync = tmp; V("Setting rsync = %s", rSync);} 8543 if ((tmp = configs->getstr(configs, "rsync", false)) != NULL) {rSync = tmp; D("Setting rsync = %s", rSync);}
8544 if ((vd = configs->getstr(configs, "rsyncPort", false)) != NULL) {rSyncPort = (int) *((float *) vd); V("Setting rsyncPort = %d", rSyncPort);} 8544 if ((vd = configs->getstr(configs, "rsyncPort", false)) != NULL) {rSyncPort = (int) *((float *) vd); D("Setting rsyncPort = %d", rSyncPort);}
8545 if ((tmp = configs->getstr(configs, "webRoot", false)) != NULL) {webRoot = tmp; V("Setting webRoot = %s", webRoot);} 8545 if ((tmp = configs->getstr(configs, "webRoot", false)) != NULL) {webRoot = tmp; D("Setting webRoot = %s", webRoot);}
8546 if ((tmp = configs->getstr(configs, "webSocket", false)) != NULL) {webSocket = tmp; V("Setting webSocket = %s", webSocket);} 8546 if ((tmp = configs->getstr(configs, "webSocket", false)) != NULL) {webSocket = tmp; D("Setting webSocket = %s", webSocket);}
8547 if ((vd = configs->get (configs, "seshRenew", NULL, false)) != NULL) {seshRenew = (int) *((float *) vd); V("Setting seshRenew = %d", seshRenew);} 8547 if ((vd = configs->get (configs, "seshRenew", NULL, false)) != NULL) {seshRenew = (int) *((float *) vd); D("Setting seshRenew = %d", seshRenew);}
8548 if ((vd = configs->get (configs, "idleTimeOut", NULL, false)) != NULL) {idleTimeOut = (int) *((float *) vd); V("Setting idleTimeOut = %d", idleTimeOut);} 8548 if ((vd = configs->get (configs, "idleTimeOut", NULL, false)) != NULL) {idleTimeOut = (int) *((float *) vd); D("Setting idleTimeOut = %d", idleTimeOut);}
8549 if ((vd = configs->get (configs, "seshTimeOut", NULL, false)) != NULL) {seshTimeOut = (int) *((float *) vd); V("Setting seshTimeOut = %d", seshTimeOut);} 8549 if ((vd = configs->get (configs, "seshTimeOut", NULL, false)) != NULL) {seshTimeOut = (int) *((float *) vd); D("Setting seshTimeOut = %d", seshTimeOut);}
8550 if ((vd = configs->get (configs, "newbieTimeOut", NULL, false)) != NULL) {newbieTimeOut = (int) *((float *) vd); V("Setting newbieTimeOut = %d", newbieTimeOut);} 8550 if ((vd = configs->get (configs, "newbieTimeOut", NULL, false)) != NULL) {newbieTimeOut = (int) *((float *) vd); D("Setting newbieTimeOut = %d", newbieTimeOut);}
8551 if ((tmp = configs->getstr(configs, "ToS", false)) != NULL) {ToS = tmp; V("Setting ToS = %s", ToS);} 8551 if ((tmp = configs->getstr(configs, "ToS", false)) != NULL) {ToS = tmp; d("Setting ToS = %s", ToS);}
8552 if ((tmp = configs->getstr(configs, "webIframers", false)) != NULL) {webIframers = tmp; V("Setting webIframers = %s", webIframers);} 8552 if ((tmp = configs->getstr(configs, "webIframers", false)) != NULL) {webIframers = tmp; D("Setting webIframers = %s", webIframers);}
8553 result = TRUE; 8553 result = TRUE;
8554 } 8554 }
8555 } 8555 }
@@ -9214,7 +9214,7 @@ Copy correct config/config.ini to there.
9214 ourSims->target = xmprintf("%s %s", toys.optargs[1], toys.optargs[2]); 9214 ourSims->target = xmprintf("%s %s", toys.optargs[1], toys.optargs[2]);
9215 else 9215 else
9216 ourSims->target = NULL; 9216 ourSims->target = NULL;
9217//V("Doing %s for %s '%s' %s %s", modeStrings[currentMode], FLAG(m) ? "member" : "", ourSims->target, FLAG(q) ? "quiet" : "", FLAG(a) ? "all" : ""); 9217V("Doing %s for %s '%s' %s %s", modeStrings[currentMode], FLAG(m) ? "member" : "", ourSims->target, FLAG(q) ? "quiet" : "", FLAG(a) ? "all" : "");
9218 9218
9219 // Start ROBUST or join the tmux session, or just figure out where the sims are running in tmux. 9219 // Start ROBUST or join the tmux session, or just figure out where the sims are running in tmux.
9220 if ((START == currentMode) && !checkSimIsRunning("ROBUST")) 9220 if ((START == currentMode) && !checkSimIsRunning("ROBUST"))
generated by cgit v1.1 at 2024-05-07 16:33:25 +0000