Merge 4ec6a14252a5bf93a8e0eaeaa83e9317a1211990 into 04f993be7563de76eaafc89bb97edbbc8d9e941f

Version bump
Merge pull request #527 from RickConsole/fix/index-hanging
2025-09-07 23:26:55 +00:00 · 2025-06-29 10:44:51 -05:00 · 2025-06-12 21:04:35 -04:00 · 2025-06-12 20:19:53 -04:00 · 2025-04-18 16:16:38 -04:00 · 2023-12-20 09:45:15 -06:00
4 changed files with 10 additions and 6 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -89,7 +89,7 @@ target_include_directories(
 target_compile_options(
        sist2
        PRIVATE
-        -fPIC
+#        -fPIC
 )

 if (SIST_DEBUG)
@ -147,7 +147,7 @@ add_dependencies(
 target_link_libraries(
        sist2

-        m
+#        m
        z
        argparse
        unofficial::mongoose::mongoose
--- a/sist2-admin/frontend/src/components/NavBar.vue
+++ b/sist2-admin/frontend/src/components/NavBar.vue
@ -3,7 +3,11 @@
    <b-navbar-brand to="/">
      <Sist2Icon></Sist2Icon>
    </b-navbar-brand>
-
+    
+    <span class="badge badge-pill version" v-if="$store && $store.state.sist2Info">
+      v{{ sist2Version() }}
+    </span>
+      
    <b-button class="ml-auto" to="/task" variant="link">{{ $t("tasks") }}</b-button>
  </b-navbar>
 </template>
@ -66,4 +70,4 @@ export default {
 .btn-link {
  color: #222;
 }
-</style>
+</style>
--- a/sist2-admin/sist2_admin/jobs.py
+++ b/sist2-admin/sist2_admin/jobs.py
@ -220,7 +220,7 @@ class Sist2IndexTask(Sist2Task):
            except ProcessLookupError:
                pass
            try:
-                os.wait()
+                os.waitpid(pid, 0)
            except ChildProcessError:
                pass

--- a/src/sist.h
+++ b/src/sist.h
@ -55,7 +55,7 @@
 static const char *const Version = VERSION;
 static const int VersionMajor = 3;
 static const int VersionMinor = 4;
-static const int VersionPatch = 3;
+static const int VersionPatch = 4;

 #ifndef SIST_PLATFORM
 #define SIST_PLATFORM unknown
Author	SHA1	Message	Date
Andrew	7663574b43	Merge 4ec6a14252a5bf93a8e0eaeaa83e9317a1211990 into 04f993be7563de76eaafc89bb97edbbc8d9e941f	2025-06-29 10:44:51 -05:00
Shy	04f993be75	Version bump	2025-06-12 21:04:35 -04:00
Shy	ab9eab3536	Merge pull request #527 from RickConsole/fix/index-hanging fixed occasional hanging when indexing	2025-06-12 20:19:53 -04:00
Rick Console	8bb12f8ae2	fixed occasional hanging when indexing	2025-04-18 16:16:38 -04:00
Andrew	4ec6a14252	Add Version in sist2-admin Added the version badge-pill to the sist2-admin page so you can check the version without going to the main search frontend.	2023-12-20 09:45:15 -06:00