From faf438a7985d4512f7ef743cf9cf5a1bee1a9548 Mon Sep 17 00:00:00 2001 From: simon987 Date: Fri, 14 Apr 2023 20:51:35 -0400 Subject: [PATCH] Add error message in home page on ES connection error #331 --- .gitattributes | 3 - Dockerfile | 2 +- Dockerfile.arm64 | 2 +- sist2-vue/src/views/SearchPage.vue | 494 +++++++++++++++-------------- src/sist.h | 4 +- src/web/serve.c | 3 + third-party/libscan/CMakeLists.txt | 2 +- 7 files changed, 262 insertions(+), 248 deletions(-) delete mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index ebae9ce..0000000 --- a/.gitattributes +++ /dev/null @@ -1,3 +0,0 @@ -CMakeModules/* linguist-vendored -**/*_generated.c linguist-vendored -**/*_generated.h linguist-vendored diff --git a/Dockerfile b/Dockerfile index af69ff0..6aabd31 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ COPY sist2-admin sist2-admin RUN cd sist2-vue/ && npm install && npm run build RUN cd sist2-admin/frontend/ && npm install && npm run build -RUN mkdir build && cd build && cmake -DSIST_PLATFORM=x64_linux -DSIST_DEBUG=off -DBUILD_TESTS=off -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake .. +RUN mkdir build && cd build && cmake -DSIST_PLATFORM=x64_linux_docker -DSIST_DEBUG=off -DBUILD_TESTS=off -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake .. RUN cd build && make -j$(nproc) RUN strip build/sist2 || mv build/sist2_debug build/sist2 diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 66c2e4f..a914629 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -3,7 +3,7 @@ MAINTAINER simon987 WORKDIR /build/ ADD . /build/ -RUN mkdir build && cd build && cmake -DSIST_PLATFORM=arm64_linux -DSIST_DEBUG=off -DBUILD_TESTS=off -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake .. +RUN mkdir build && cd build && cmake -DSIST_PLATFORM=arm64_linux_docker -DSIST_DEBUG=off -DBUILD_TESTS=off -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake .. RUN cd build && make -j$(nproc) RUN strip build/sist2 || mv build/sist2_debug build/sist2 diff --git a/sist2-vue/src/views/SearchPage.vue b/sist2-vue/src/views/SearchPage.vue index 1184e2e..66e050e 100644 --- a/sist2-vue/src/views/SearchPage.vue +++ b/sist2-vue/src/views/SearchPage.vue @@ -1,57 +1,61 @@ \ No newline at end of file diff --git a/src/sist.h b/src/sist.h index 3598cb6..28aa580 100644 --- a/src/sist.h +++ b/src/sist.h @@ -51,11 +51,11 @@ #include #include "git_hash.h" -#define VERSION "3.0.0" +#define VERSION "3.0.1" static const char *const Version = VERSION; static const int VersionMajor = 3; static const int VersionMinor = 0; -static const int VersionPatch = 0; +static const int VersionPatch = 1; #ifndef SIST_PLATFORM #define SIST_PLATFORM unknown diff --git a/src/web/serve.c b/src/web/serve.c index 2c867b2..0d2f1ee 100644 --- a/src/web/serve.c +++ b/src/web/serve.c @@ -668,6 +668,9 @@ static void ev_router(struct mg_connection *nc, int ev, void *ev_data, UNUSED(vo mg_send(nc, r->body, r->size); } else if (r->status_code == 0) { sist_log("serve.c", LOG_SIST_ERROR, "Could not connect to elasticsearch!"); + + mg_http_reply(nc, 503, HTTP_SERVER_HEADER HTTP_TEXT_TYPE_HEADER, + "Elasticsearch connection error, see server logs."); } else { sist_logf("serve.c", LOG_SIST_WARNING, "ElasticSearch error during query (%d)", r->status_code); if (r->size != 0) { diff --git a/third-party/libscan/CMakeLists.txt b/third-party/libscan/CMakeLists.txt index ee7ca73..bffe14c 100644 --- a/third-party/libscan/CMakeLists.txt +++ b/third-party/libscan/CMakeLists.txt @@ -106,7 +106,7 @@ find_library(MUPDF_LIB NAMES liblibmupdf.a) find_library(CMS_LIB NAMES lcms2) find_library(JAS_LIB NAMES jasper) find_library(GUMBO_LIB NAMES gumbo) -find_library(GOMP_LIB NAMES libgomp.a gomp PATHS /usr/lib/gcc/x86_64-linux-gnu/11/ /usr/lib/gcc/x86_64-linux-gnu/5/ /usr/lib/gcc/x86_64-linux-gnu/9/ /usr/lib/gcc/x86_64-linux-gnu/10/ /usr/lib/gcc/aarch64-linux-gnu/7/ /usr/lib/gcc/aarch64-linux-gnu/9/ /usr/lib/gcc/x86_64-linux-gnu/7/ /usr/lib/gcc/aarch64-linux-gnu/11/) +find_library(GOMP_LIB NAMES libgomp.a gomp PATHS /usr/lib/gcc/x86_64-linux-gnu/11/ /usr/lib/gcc/x86_64-linux-gnu/5/ /usr/lib/gcc/x86_64-linux-gnu/9/ /usr/lib/gcc/x86_64-linux-gnu/10/ /usr/lib/gcc/aarch64-linux-gnu/7/ /usr/lib/gcc/aarch64-linux-gnu/9/ /usr/lib/gcc/x86_64-linux-gnu/7/ /usr/lib/gcc/aarch64-linux-gnu/11/ /usr/lib/gcc/x86_64-linux-gnu/8/ /usr/lib/gcc/aarch64-linux-gnu/7/) find_package(Leptonica CONFIG REQUIRED) find_package(FFMPEG REQUIRED) find_package(libraw CONFIG REQUIRED)