Add error message in home page on ES connection error #331

.gitattributes

@@ -1,3 +0,0 @@
-CMakeModules/* linguist-vendored
-**/*_generated.c linguist-vendored
-**/*_generated.h linguist-vendored

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
 

Dockerfile.arm64

@@ -3,7 +3,7 @@ MAINTAINER simon987 <me@simon987.net>
 
 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
 

sist2-vue/src/views/SearchPage.vue

@@ -1,57 +1,61 @@
 <template>
-  <div class="container">
-    <Lightbox></Lightbox>
-    <HelpDialog :show="showHelp" @close="showHelp = false"></HelpDialog>
+    <div class="container">
+        <Lightbox></Lightbox>
+        <HelpDialog :show="showHelp" @close="showHelp = false"></HelpDialog>
 
-    <b-card v-if="uiLoading">
-      <Preloader></Preloader>
-    </b-card>
+        <b-card v-if="uiLoading">
+            <Preloader></Preloader>
+        </b-card>
 
-    <b-card v-show="!uiLoading" id="search-panel">
-      <SearchBar @show-help="showHelp=true"></SearchBar>
-      <b-row>
-        <b-col style="height: 70px;" sm="6">
-          <SizeSlider></SizeSlider>
-        </b-col>
-        <b-col>
-          <PathTree @search="search(true)"></PathTree>
-        </b-col>
-      </b-row>
-      <b-row>
-        <b-col sm="6">
-          <DateSlider></DateSlider>
-          <b-row>
-            <b-col>
-              <IndexPicker></IndexPicker>
-            </b-col>
-          </b-row>
-        </b-col>
-        <b-col>
-          <b-tabs justified>
-            <b-tab :title="$t('mimeTypes')">
-              <MimePicker></MimePicker>
-            </b-tab>
-            <b-tab :title="$t('tags')">
-              <TagPicker :show-search-bar="$store.state.optShowTagPickerFilter"></TagPicker>
-            </b-tab>
-          </b-tabs>
-        </b-col>
-      </b-row>
-    </b-card>
+        <b-alert v-show="!uiLoading && showEsConnectionError" show variant="danger" class="mt-2">
+            {{ $t("toast.esConnErr") }}
+        </b-alert>
 
-    <div v-show="docs.length === 0 && !uiLoading">
-      <Preloader v-if="searchBusy" class="mt-3"></Preloader>
+        <b-card v-show="!uiLoading && !showEsConnectionError" id="search-panel">
+            <SearchBar @show-help="showHelp=true"></SearchBar>
+            <b-row>
+                <b-col style="height: 70px;" sm="6">
+                    <SizeSlider></SizeSlider>
+                </b-col>
+                <b-col>
+                    <PathTree @search="search(true)"></PathTree>
+                </b-col>
+            </b-row>
+            <b-row>
+                <b-col sm="6">
+                    <DateSlider></DateSlider>
+                    <b-row>
+                        <b-col>
+                            <IndexPicker></IndexPicker>
+                        </b-col>
+                    </b-row>
+                </b-col>
+                <b-col>
+                    <b-tabs justified>
+                        <b-tab :title="$t('mimeTypes')">
+                            <MimePicker></MimePicker>
+                        </b-tab>
+                        <b-tab :title="$t('tags')">
+                            <TagPicker :show-search-bar="$store.state.optShowTagPickerFilter"></TagPicker>
+                        </b-tab>
+                    </b-tabs>
+                </b-col>
+            </b-row>
+        </b-card>
 
-      <ResultsCard></ResultsCard>
+        <div v-show="docs.length === 0 && !uiLoading">
+            <Preloader v-if="searchBusy" class="mt-3"></Preloader>
+
+            <ResultsCard></ResultsCard>
+        </div>
+
+        <div v-if="docs.length > 0">
+            <ResultsCard></ResultsCard>
+
+            <DocCardWall v-if="optDisplay==='grid'" :docs="docs" :append="appendFunc"></DocCardWall>
+            <DocList v-else :docs="docs" :append="appendFunc"></DocList>
+        </div>
     </div>
-
-    <div v-if="docs.length > 0">
-      <ResultsCard></ResultsCard>
-
-      <DocCardWall v-if="optDisplay==='grid'" :docs="docs" :append="appendFunc"></DocCardWall>
-      <DocList v-else :docs="docs" :append="appendFunc"></DocList>
-    </div>
-  </div>
 </template>
 
 <script lang="ts">
@@ -78,234 +82,244 @@ import HelpDialog from "@/components/HelpDialog.vue";
 
 
 export default Vue.extend({
-  components: {
-    HelpDialog,
-    DocList,
-    TagPicker,
-    DateSlider,
-    SizeSlider, PathTree, ResultsCard, MimePicker, Lightbox, DocCardWall, IndexPicker, SearchBar, Preloader
-  },
-  data: () => ({
-    loading: false,
-    uiLoading: true,
-    search: undefined as any,
-    docs: [] as EsHit[],
-    docIds: new Set(),
-    docChecksums: new Set(),
-    searchBusy: false,
-    Sist2Query: Sist2Query,
-    showHelp: false
-  }),
-  computed: {
-    ...mapGetters(["indices", "optDisplay"]),
-  },
-  mounted() {
-    // Handle touch events
-    window.ontouchend = () => this.$store.commit("busTouchEnd");
-    window.ontouchcancel = this.$store.commit("busTouchEnd");
-
-    this.search = _debounce(async (clear: boolean) => {
-      if (clear) {
-        await this.clearResults();
-      }
-
-      await this.searchNow(Sist2Query.searchQuery());
-
-    }, 350, {leading: false});
-
-    this.$store.dispatch("loadFromArgs", this.$route).then(() => {
-      this.$store.subscribe(() => this.$store.dispatch("updateArgs", this.$router));
-      this.$store.subscribe((mutation) => {
-        if ([
-          "setSizeMin", "setSizeMax", "setDateMin", "setDateMax", "setSearchText", "setPathText",
-          "setSortMode", "setOptHighlight", "setOptFragmentSize", "setFuzzy", "setSize", "setSelectedIndices",
-          "setSelectedMimeTypes", "setSelectedTags", "setOptQueryMode", "setOptSearchInPath",
-        ].includes(mutation.type)) {
-          if (this.searchBusy) {
-            return;
-          }
-
-          this.search(true);
-        }
-      });
-    });
-
-    this.setIndices(this.$store.getters["sist2Info"].indices)
-
-    this.getDateRange().then((range: { min: number, max: number }) => {
-      this.setDateBoundsMin(range.min);
-      this.setDateBoundsMax(range.max);
-
-      const doBlankSearch = !this.$store.state.optUpdateMimeMap;
-
-      Sist2Api.getMimeTypes(Sist2Query.searchQuery(doBlankSearch)).then(({mimeMap}) => {
-        this.$store.commit("setUiMimeMap", mimeMap);
-        this.uiLoading = false;
-        this.search(true);
-      });
-    });
-  },
-  methods: {
-    ...mapActions({
-      setSist2Info: "setSist2Info",
+    components: {
+        HelpDialog,
+        DocList,
+        TagPicker,
+        DateSlider,
+        SizeSlider, PathTree, ResultsCard, MimePicker, Lightbox, DocCardWall, IndexPicker, SearchBar, Preloader
+    },
+    data: () => ({
+        loading: false,
+        uiLoading: true,
+        search: undefined as any,
+        docs: [] as EsHit[],
+        docIds: new Set(),
+        docChecksums: new Set(),
+        searchBusy: false,
+        Sist2Query: Sist2Query,
+        showHelp: false,
+        showEsConnectionError: false
     }),
-    ...mapMutations({
-      setIndices: "setIndices",
-      setDateBoundsMin: "setDateBoundsMin",
-      setDateBoundsMax: "setDateBoundsMax",
-      setTags: "setTags",
-    }),
-    showErrorToast() {
-      this.$bvToast.toast(
-          this.$t("toast.esConnErr"),
-          {
-            title: this.$t("toast.esConnErrTitle"),
-            noAutoHide: true,
-            toaster: "b-toaster-bottom-right",
-            headerClass: "toast-header-error",
-            bodyClass: "toast-body-error",
-          });
+    computed: {
+        ...mapGetters(["indices", "optDisplay"]),
     },
-    showSyntaxErrorToast: function (): void {
-      this.$bvToast.toast(
-          this.$t("toast.esQueryErr"),
-          {
-            title: this.$t("toast.esQueryErrTitle"),
-            noAutoHide: true,
-            toaster: "b-toaster-bottom-right",
-            headerClass: "toast-header-warning",
-            bodyClass: "toast-body-warning",
-          });
-    },
-    async searchNow(q: any) {
-      this.searchBusy = true;
-      await this.$store.dispatch("incrementQuerySequence");
-      this.$store.commit("busSearch");
+    mounted() {
+        // Handle touch events
+        window.ontouchend = () => this.$store.commit("busTouchEnd");
+        window.ontouchcancel = this.$store.commit("busTouchEnd");
 
-      Sist2Api.esQuery(q).then(async (resp: EsResult) => {
-        await this.handleSearch(resp);
-        this.searchBusy = false;
-      }).catch(err => {
-        if (err.response.status === 500 && this.$store.state.optQueryMode === "advanced") {
-          this.showSyntaxErrorToast();
-        } else {
-          this.showErrorToast();
-        }
-      });
-    },
-    async clearResults() {
-      this.docs = [];
-      this.docIds.clear();
-      this.docChecksums.clear();
-      await this.$store.dispatch("clearResults");
-      this.$store.commit("setUiReachedScrollEnd", false);
-    },
-    async handleSearch(resp: EsResult) {
-      if (resp.hits.hits.length == 0 || resp.hits.hits.length < this.$store.state.optSize) {
-        this.$store.commit("setUiReachedScrollEnd", true);
-      }
+        this.search = _debounce(async (clear: boolean) => {
+            if (clear) {
+                await this.clearResults();
+            }
 
-      resp.hits.hits = resp.hits.hits.filter(hit => !this.docIds.has(hit._id));
+            await this.searchNow(Sist2Query.searchQuery());
 
-      if (this.$store.state.optHideDuplicates) {
-        resp.hits.hits = resp.hits.hits.filter(hit => {
+        }, 350, {leading: false});
 
-          if (!("checksum" in hit._source)) {
-            return true;
-          }
+        this.$store.dispatch("loadFromArgs", this.$route).then(() => {
+            this.$store.subscribe(() => this.$store.dispatch("updateArgs", this.$router));
+            this.$store.subscribe((mutation) => {
+                if ([
+                    "setSizeMin", "setSizeMax", "setDateMin", "setDateMax", "setSearchText", "setPathText",
+                    "setSortMode", "setOptHighlight", "setOptFragmentSize", "setFuzzy", "setSize", "setSelectedIndices",
+                    "setSelectedMimeTypes", "setSelectedTags", "setOptQueryMode", "setOptSearchInPath",
+                ].includes(mutation.type)) {
+                    if (this.searchBusy) {
+                        return;
+                    }
 
-          const isDupe = !this.docChecksums.has(hit._source.checksum);
-          this.docChecksums.add(hit._source.checksum);
-          return isDupe;
+                    this.search(true);
+                }
+            });
         });
-      }
 
-      for (const hit of resp.hits.hits) {
-        if (hit._props.isPlayableImage || hit._props.isPlayableVideo) {
-          hit._seq = await this.$store.dispatch("getKeySequence");
-          this.$store.commit("addLightboxSource", {
-            source: `f/${hit._id}`,
-            thumbnail: hit._props.hasThumbnail
-                ? `t/${hit._source.index}/${hit._id}`
-                : null,
-            caption: {
-              component: LightboxCaption,
-              props: {hit: hit}
-            },
-            type: hit._props.isVideo ? "video" : "image"
-          });
-        }
-      }
+        this.setIndices(this.$store.getters["sist2Info"].indices)
 
-      await this.$store.dispatch("remountLightbox");
-      this.$store.commit("setLastQueryResult", resp);
+        this.getDateRange().then((range: { min: number, max: number }) => {
+            this.setDateBoundsMin(range.min);
+            this.setDateBoundsMax(range.max);
 
-      this.docs.push(...resp.hits.hits);
+            const doBlankSearch = !this.$store.state.optUpdateMimeMap;
 
-      resp.hits.hits.forEach(hit => this.docIds.add(hit._id));
+            Sist2Api.getMimeTypes(Sist2Query.searchQuery(doBlankSearch)).then(({mimeMap}) => {
+                this.$store.commit("setUiMimeMap", mimeMap);
+                this.uiLoading = false;
+                this.search(true);
+            });
+        }).catch(error => {
+            console.log(error.response);
+
+            if (error.response.status == 503 || error.response.status == 500) {
+                this.showEsConnectionError = true;
+                this.uiLoading = false;
+            } else {
+                this.showErrorToast();
+            }
+        });
     },
-    getDateRange(): Promise<{ min: number, max: number }> {
-      return sist2.esQuery({
-        // TODO: filter current selected indices
-        aggs: {
-          dateMin: {min: {field: "mtime"}},
-          dateMax: {max: {field: "mtime"}},
+    methods: {
+        ...mapActions({
+            setSist2Info: "setSist2Info",
+        }),
+        ...mapMutations({
+            setIndices: "setIndices",
+            setDateBoundsMin: "setDateBoundsMin",
+            setDateBoundsMax: "setDateBoundsMax",
+            setTags: "setTags",
+        }),
+        showErrorToast() {
+            this.$bvToast.toast(
+                this.$t("toast.esConnErr"),
+                {
+                    title: this.$t("toast.esConnErrTitle"),
+                    noAutoHide: true,
+                    toaster: "b-toaster-bottom-right",
+                    headerClass: "toast-header-error",
+                    bodyClass: "toast-body-error",
+                });
         },
-        size: 0
-      }).then(res => {
-        return {
-          min: res.aggregations.dateMin.value,
-          max: res.aggregations.dateMax.value,
+        showSyntaxErrorToast: function (): void {
+            this.$bvToast.toast(
+                this.$t("toast.esQueryErr"),
+                {
+                    title: this.$t("toast.esQueryErrTitle"),
+                    noAutoHide: true,
+                    toaster: "b-toaster-bottom-right",
+                    headerClass: "toast-header-warning",
+                    bodyClass: "toast-body-warning",
+                });
+        },
+        async searchNow(q: any) {
+            this.searchBusy = true;
+            await this.$store.dispatch("incrementQuerySequence");
+            this.$store.commit("busSearch");
+
+            Sist2Api.esQuery(q).then(async (resp: EsResult) => {
+                await this.handleSearch(resp);
+                this.searchBusy = false;
+            }).catch(err => {
+                if (err.response.status === 500 && this.$store.state.optQueryMode === "advanced") {
+                    this.showSyntaxErrorToast();
+                } else {
+                    this.showErrorToast();
+                }
+            });
+        },
+        async clearResults() {
+            this.docs = [];
+            this.docIds.clear();
+            this.docChecksums.clear();
+            await this.$store.dispatch("clearResults");
+            this.$store.commit("setUiReachedScrollEnd", false);
+        },
+        async handleSearch(resp: EsResult) {
+            if (resp.hits.hits.length == 0 || resp.hits.hits.length < this.$store.state.optSize) {
+                this.$store.commit("setUiReachedScrollEnd", true);
+            }
+
+            resp.hits.hits = resp.hits.hits.filter(hit => !this.docIds.has(hit._id));
+
+            if (this.$store.state.optHideDuplicates) {
+                resp.hits.hits = resp.hits.hits.filter(hit => {
+
+                    if (!("checksum" in hit._source)) {
+                        return true;
+                    }
+
+                    const isDupe = !this.docChecksums.has(hit._source.checksum);
+                    this.docChecksums.add(hit._source.checksum);
+                    return isDupe;
+                });
+            }
+
+            for (const hit of resp.hits.hits) {
+                if (hit._props.isPlayableImage || hit._props.isPlayableVideo) {
+                    hit._seq = await this.$store.dispatch("getKeySequence");
+                    this.$store.commit("addLightboxSource", {
+                        source: `f/${hit._id}`,
+                        thumbnail: hit._props.hasThumbnail
+                            ? `t/${hit._source.index}/${hit._id}`
+                            : null,
+                        caption: {
+                            component: LightboxCaption,
+                            props: {hit: hit}
+                        },
+                        type: hit._props.isVideo ? "video" : "image"
+                    });
+                }
+            }
+
+            await this.$store.dispatch("remountLightbox");
+            this.$store.commit("setLastQueryResult", resp);
+
+            this.docs.push(...resp.hits.hits);
+
+            resp.hits.hits.forEach(hit => this.docIds.add(hit._id));
+        },
+        getDateRange(): Promise<{ min: number, max: number }> {
+            return sist2.esQuery({
+                // TODO: filter current selected indices
+                aggs: {
+                    dateMin: {min: {field: "mtime"}},
+                    dateMax: {max: {field: "mtime"}},
+                },
+                size: 0
+            }).then(res => {
+                return {
+                    min: res.aggregations.dateMin.value,
+                    max: res.aggregations.dateMax.value,
+                }
+            })
+        },
+        appendFunc() {
+            if (!this.$store.state.uiReachedScrollEnd && this.search && !this.searchBusy) {
+                this.searchNow(Sist2Query.searchQuery());
+            }
+        }
+    },
+    beforeRouteUpdate(to, from, next) {
+        if (this.$store.state.uiLightboxIsOpen) {
+            this.$store.commit("_setUiShowLightbox", false);
+            next(false);
+        } else {
+            next();
         }
-      })
     },
-    appendFunc() {
-      if (!this.$store.state.uiReachedScrollEnd && this.search && !this.searchBusy) {
-        this.searchNow(Sist2Query.searchQuery());
-      }
-    }
-  },
-  beforeRouteUpdate(to, from, next) {
-    if (this.$store.state.uiLightboxIsOpen) {
-      this.$store.commit("_setUiShowLightbox", false);
-      next(false);
-    } else {
-      next();
-    }
-  },
 })
 </script>
 
 <style>
 
 #search-panel {
-  box-shadow: 0 .125rem .25rem rgba(0, 0, 0, .08) !important;
-  border-radius: 0;
-  border: none;
+    box-shadow: 0 .125rem .25rem rgba(0, 0, 0, .08) !important;
+    border-radius: 0;
+    border: none;
 }
 
 .toast-header-info, .toast-body-info {
-  background: #2196f3;
-  color: #fff !important;
+    background: #2196f3;
+    color: #fff !important;
 }
 
 .toast-header-error, .toast-body-error {
-  background: #a94442;
-  color: #f2dede !important;
+    background: #a94442;
+    color: #f2dede !important;
 }
 
 .toast-header-error {
-  color: #fff !important;
-  border-bottom: none;
-  margin-bottom: -1em;
+    color: #fff !important;
+    border-bottom: none;
+    margin-bottom: -1em;
 }
 
 .toast-header-error .close {
-  text-shadow: none;
+    text-shadow: none;
 }
 
 .toast-header-warning, .toast-body-warning {
-  background: #FF8F00;
-  color: #FFF3E0 !important;
+    background: #FF8F00;
+    color: #FFF3E0 !important;
 }
 </style>

src/sist.h

@@ -51,11 +51,11 @@
 #include <ctype.h>
 #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

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) {

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)