diff options
author | onefang | 2021-09-14 15:50:12 +1000 |
---|---|---|
committer | onefang | 2021-09-14 15:50:12 +1000 |
commit | 8a9d25cecba0236732a7ab8cb47d15b1156e0aad (patch) | |
tree | 8938cf79a0ab3fa4bd1aa6e00b1a36818c196e4d | |
parent | Make sure we have a useful ourSims for the web server when needed. (diff) | |
download | opensim-SC-8a9d25cecba0236732a7ab8cb47d15b1156e0aad.zip opensim-SC-8a9d25cecba0236732a7ab8cb47d15b1156e0aad.tar.gz opensim-SC-8a9d25cecba0236732a7ab8cb47d15b1156e0aad.tar.bz2 opensim-SC-8a9d25cecba0236732a7ab8cb47d15b1156e0aad.tar.xz |
Maybe we can find the backup sim this time?
-rw-r--r-- | src/sledjchisl/sledjchisl.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/sledjchisl/sledjchisl.c b/src/sledjchisl/sledjchisl.c index e3a5cbc..d3f1b5f 100644 --- a/src/sledjchisl/sledjchisl.c +++ b/src/sledjchisl/sledjchisl.c | |||
@@ -1717,6 +1717,7 @@ simList *getSims() | |||
1717 | { | 1717 | { |
1718 | if (NULL != ourSims) return ourSims; | 1718 | if (NULL != ourSims) return ourSims; |
1719 | 1719 | ||
1720 | V("getSims()"); | ||
1720 | int i, fd = -1; | 1721 | int i, fd = -1; |
1721 | size_t l; | 1722 | size_t l; |
1722 | char *file = xmprintf("%s/sims.lua", scEtc); | 1723 | char *file = xmprintf("%s/sims.lua", scEtc); |
@@ -2070,6 +2071,7 @@ void findWindow(simData *simd, char *sim, char *type, int count, int window, int | |||
2070 | snprintf(toybuf, sizeof(toybuf), "%d %d", window, pane); | 2071 | snprintf(toybuf, sizeof(toybuf), "%d %d", window, pane); |
2071 | free(simd->paneID); | 2072 | free(simd->paneID); |
2072 | simd->paneID = xmprintf("%s", qLuaGet(IDs, toybuf)->v.s); | 2073 | simd->paneID = xmprintf("%s", qLuaGet(IDs, toybuf)->v.s); |
2074 | V("findWindow -> paneID %s", simd->paneID); | ||
2073 | freeLuaTree(IDs); | 2075 | freeLuaTree(IDs); |
2074 | if (strcmp(backupIARsim, sim) == 0) | 2076 | if (strcmp(backupIARsim, sim) == 0) |
2075 | { | 2077 | { |
@@ -2152,6 +2154,7 @@ void findSimsTmux(simData *simd, char *sim, char *type, int count, int window, i | |||
2152 | qtreetbl_t *IDs = Lua2tree(toybuf, "IDs"); | 2154 | qtreetbl_t *IDs = Lua2tree(toybuf, "IDs"); |
2153 | snprintf(toybuf, sizeof(toybuf), "%d %d", window, pane); | 2155 | snprintf(toybuf, sizeof(toybuf), "%d %d", window, pane); |
2154 | simd->paneID = xmprintf("%s", qLuaGet(IDs, toybuf)->v.s); | 2156 | simd->paneID = xmprintf("%s", qLuaGet(IDs, toybuf)->v.s); |
2157 | V("findSimsTmux -> paneID %s -> %s", sim, simd->paneID); | ||
2155 | freeLuaTree(IDs); | 2158 | freeLuaTree(IDs); |
2156 | } | 2159 | } |
2157 | 2160 | ||
@@ -5815,9 +5818,9 @@ notWritten: | |||
5815 | { | 5818 | { |
5816 | char *c = xmprintf("load iar -m %s %s / password /opt/opensim_SC/backups/DefaultMember.IAR", first, last); | 5819 | char *c = xmprintf("load iar -m %s %s / password /opt/opensim_SC/backups/DefaultMember.IAR", first, last); |
5817 | 5820 | ||
5818 | I("Loading default member IAR for %s %s in sim %s, this might take a couple of minutes.", first, last, name); | 5821 | I("Loading default member IAR for %s %s in sim %s (pane %s), this might take a couple of minutes.", first, last, name, ourSims->backup); |
5819 | V("In pane %s -> %s", simd->paneID, c); | 5822 | V("In pane %s -> %s", ourSims->backup, c); |
5820 | sendTmuxCmd(simd->paneID, c); | 5823 | sendTmuxCmd(ourSims->backup, c); |
5821 | free(c); | 5824 | free(c); |
5822 | } | 5825 | } |
5823 | } | 5826 | } |