aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/sledjchisl/sledjchisl.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/sledjchisl/sledjchisl.c')
-rw-r--r--src/sledjchisl/sledjchisl.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sledjchisl/sledjchisl.c b/src/sledjchisl/sledjchisl.c
index 79a3b57..1bcf873 100644
--- a/src/sledjchisl/sledjchisl.c
+++ b/src/sledjchisl/sledjchisl.c
@@ -1623,7 +1623,7 @@ int checkSimIsRunning(char *sim)
1623 struct stat st; 1623 struct stat st;
1624 1624
1625 // Check if it's running. 1625 // Check if it's running.
1626 char *path = xmprintf("%s/caches/%s.pid", scRoot, sim); 1626 char *path = xmprintf("%s/%s.pid", scRun, sim);
1627 if (0 == stat(path, &st)) 1627 if (0 == stat(path, &st))
1628 { 1628 {
1629 int fd, i; 1629 int fd, i;
@@ -1651,7 +1651,7 @@ int checkSimIsRunning(char *sim)
1651 if (0 != WEXITSTATUS(i)) // No such pid. 1651 if (0 != WEXITSTATUS(i)) // No such pid.
1652 { 1652 {
1653 free(path); 1653 free(path);
1654 path = xmprintf("rm -f %s/caches/%s.pid", scRoot, sim); 1654 path = xmprintf("rm -f %s/%s.pid", scRun, sim);
1655 d("%s", path); 1655 d("%s", path);
1656 i = system(path); 1656 i = system(path);
1657 if (WIFEXITED(i)) 1657 if (WIFEXITED(i))
@@ -1672,7 +1672,7 @@ int checkSimIsRunning(char *sim)
1672 1672
1673 // Now check if it's really really running. lol 1673 // Now check if it's really really running. lol
1674 free(path); 1674 free(path);
1675 path = xmprintf("%s/caches/%s.pid", scRoot, sim); 1675 path = xmprintf("%s/%s.pid", scRun, sim);
1676 if (0 == stat(path, &st)) 1676 if (0 == stat(path, &st))
1677 { 1677 {
1678 D("checkSimIsRunning(%s) -> %s is really really running.", sim, path); 1678 D("checkSimIsRunning(%s) -> %s is really really running.", sim, path);
@@ -1745,7 +1745,7 @@ void prepSims(simData *simd, char *sim, char *type, int count, int window, int p
1745 " -e 's@\\[Region\\]@" 1745 " -e 's@\\[Region\\]@"
1746 " paneID = \"\\%s\"\\n" 1746 " paneID = \"\\%s\"\\n"
1747 "\\[Startup\\]\\n" 1747 "\\[Startup\\]\\n"
1748 " PIDFile = \"\\$\\{Paths\\|CachePath\\}\\/\\$\\{Const\\|mysim\\}\\.pid\"\\n" 1748 " PIDFile = \"\\$\\{Paths\\|PIDPath\\}\\/\\$\\{Const\\|mysim\\}\\.pid\"\\n"
1749 " LogFile = \"\\$\\{Paths\\|LogPath\\}\\/OpenSim_\\$\\{Const\\|mysim\\}\\.log\"\\n" 1749 " LogFile = \"\\$\\{Paths\\|LogPath\\}\\/OpenSim_\\$\\{Const\\|mysim\\}\\.log\"\\n"
1750 " StatsLogFile = \"\\$\\{Paths\\|LogPath\\}\\/OpenSimStats_\\$\\{Const\\|mysim\\}\\.log\"\\n" 1750 " StatsLogFile = \"\\$\\{Paths\\|LogPath\\}\\/OpenSimStats_\\$\\{Const\\|mysim\\}\\.log\"\\n"
1751 " ConsoleHistoryFile = \"\\$\\{Paths\\|LogPath\\}\\/OpenSimConsoleHistory_\\$\\{Const\\|mysim\\}\\.txt\"\\n" 1751 " ConsoleHistoryFile = \"\\$\\{Paths\\|LogPath\\}\\/OpenSimConsoleHistory_\\$\\{Const\\|mysim\\}\\.txt\"\\n"