Merge d0ec304f7b into d800effad9

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/requirements.txt

@@ -4,4 +4,4 @@ uvicorn
 websockets
 pycron
 GitPython
-git+https://github.com/sist2app/sist2-python.git@2.1
+git+https://github.com/sist2app/sist2-python.git

sist2-admin/sist2_admin/jobs.py

@@ -220,7 +220,7 @@ class Sist2IndexTask(Sist2Task):
             except ProcessLookupError:
                 pass
             try:
-                os.waitpid(pid, 0)
+                os.wait()
             except ChildProcessError:
                 pass
 

src/database/database.c

@@ -114,7 +114,7 @@ void save_current_job_info(sqlite3_context *ctx, int argc, sqlite3_value **argv)
     char buf[PATH_MAX];
     strcpy(buf, current_job);
 
-    SET_CURRENT_JOB(ipc_ctx, current_job);
+    strcpy(ipc_ctx->current_job[ProcData.thread_id], current_job);
 
     sqlite3_result_text(ctx, "ok", -1, SQLITE_STATIC);
 }

src/database/database.h

@@ -64,8 +64,6 @@ typedef struct {
     char current_job[MAX_THREADS][PATH_MAX * 2];
 } database_ipc_ctx_t;
 
-#define SET_CURRENT_JOB(ctx, job) (strcpy((ctx)->current_job[ProcData.thread_id], job))
-
 typedef struct {
     double date_min;
     double date_max;

src/parsing/parse.c

@@ -142,10 +142,6 @@ void parse(parse_job_t *job) {
         job->vfile.calculate_checksum = ScanCtx.calculate_checksums;
     }
 
-    if (IS_SUB_JOB(job)) {
-        SET_CURRENT_JOB(ProcData.ipc_db->ipc_ctx, job->filepath);
-    }
-
     document_t *doc = malloc(sizeof(document_t));
 
     strcpy(doc->filepath, job->filepath);

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 = 4;
+static const int VersionPatch = 3;
 
 #ifndef SIST_PLATFORM
 #define SIST_PLATFORM unknown

third-party/libscan/libscan/scan.h

@@ -172,8 +172,6 @@ typedef struct {
     char filepath[PATH_MAX * 2 + 1];
 } parse_job_t;
 
-#define IS_SUB_JOB(job) ((job)->parent[0] != '\0')
-
 
 #include "util.h"