Compare commits

..

2 Commits

Author SHA1 Message Date
Shy
e57fdc1fe8 Version bump 2025-06-12 20:57:04 -04:00
Rick Console
8bb12f8ae2 fixed occasional hanging when indexing 2025-04-18 16:16:38 -04:00
5 changed files with 10 additions and 6 deletions

View File

@@ -89,7 +89,7 @@ target_include_directories(
target_compile_options( target_compile_options(
sist2 sist2
PRIVATE PRIVATE
-fPIC # -fPIC
) )
if (SIST_DEBUG) if (SIST_DEBUG)
@@ -147,7 +147,7 @@ add_dependencies(
target_link_libraries( target_link_libraries(
sist2 sist2
m # m
z z
argparse argparse
unofficial::mongoose::mongoose unofficial::mongoose::mongoose

View File

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

View File

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

View File

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

View File

@@ -55,7 +55,7 @@
static const char *const Version = VERSION; static const char *const Version = VERSION;
static const int VersionMajor = 3; static const int VersionMajor = 3;
static const int VersionMinor = 4; static const int VersionMinor = 4;
static const int VersionPatch = 3; static const int VersionPatch = 4;
#ifndef SIST_PLATFORM #ifndef SIST_PLATFORM
#define SIST_PLATFORM unknown #define SIST_PLATFORM unknown