Merge d0ec304f7b5610d79be2f84cc461f796f1322012 into 04f993be7563de76eaafc89bb97edbbc8d9e941f

fixed occasional hanging when indexing

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

README.md

@@ -43,13 +43,11 @@ services:
     image: elasticsearch:7.17.9
     restart: unless-stopped
     volumes:
-      # This directory must have 1000:1000 permissions (or update PUID & PGID below)
+      # This directory must have 1000:1000 permissions
       - /data/sist2-es-data/:/usr/share/elasticsearch/data
     environment:
       - "discovery.type=single-node"
       - "ES_JAVA_OPTS=-Xms2g -Xmx2g"
-      - "PUID=1000"
-      - "PGID=1000"
   sist2-admin:
     image: sist2app/sist2:x64-linux
     restart: unless-stopped

docker-compose.yml

@@ -5,13 +5,11 @@ services:
     image: elasticsearch:7.17.9
     container_name: sist2-es
     volumes:
-      # This directory must have 1000:1000 permissions (or update PUID & PGID below)
+      # This directory must have 1000:1000 permissions
       - /data/sist2-es-data/:/usr/share/elasticsearch/data
     environment:
       - "discovery.type=single-node"
       - "ES_JAVA_OPTS=-Xms2g -Xmx2g"
-      - "PUID=1000"
-      - "PGID=1000"
   sist2-admin:
     build:
       context: .

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
 

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