From 42be7dd7757667d48458f44c1d843ce61b33b112 Mon Sep 17 00:00:00 2001 From: sshkurov Date: Fri, 28 May 2021 13:19:37 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D1=84=D1=80=D0=BE=D0=BD=D1=82=D0=B5=D0=BD=D0=B4=20?= =?UTF-8?q?=D0=B8=20=D0=BC=D0=B5=D1=81=D1=82=D0=BE=20=D1=85=D1=80=D0=B0?= =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B?= =?UTF-8?q?=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .dockerignore | 2 +- README.md | 2 +- README_EN.md | 2 +- docker-compose.yml | 2 +- frontend | 2 +- src/main/java/ru/serega6531/packmate/service/StreamService.java | 1 + 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.dockerignore b/.dockerignore index cbf065e..33ea37f 100644 --- a/.dockerignore +++ b/.dockerignore @@ -4,5 +4,5 @@ screenshots .* docker-compose.yml Dockerfile_* -docker/postgres_data +data README* diff --git a/README.md b/README.md index 4030f9f..2b3a478 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ git submodule update --init --recursive сетевой интерфейс хоста, его название указывается переменной окружения (об этом ниже). `packmate-db` настроен на прослушивание порта 65001 с локальным IP. -Файлы БД сохраняются в ./docker/postgres_data, поэтому для обнуления базы нужно удалить эту папку. +Файлы БД сохраняются в ./data, поэтому для обнуления базы нужно удалить эту папку. ### Настройка Программа берет основные настройки из переменных окружения, поэтому для удобства diff --git a/README_EN.md b/README_EN.md index 37e39b1..098ce0c 100644 --- a/README_EN.md +++ b/README_EN.md @@ -44,7 +44,7 @@ git submodule update --init --recursive This program uses Docker and docker-compose. `packmate-db` will listen to port 65001 at localhost. -Database files are saved in ./docker/postgres_data, so to reset database you'll have to delete that directory. +Database files are saved in ./data, so in order to reset database you'll have to delete that directory. ### Settings This program retrieves settings from environment variables, diff --git a/docker-compose.yml b/docker-compose.yml index 58f074e..d0c4ab7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -42,7 +42,7 @@ services: env_file: - .env volumes: - - "./docker/postgres_data:/var/lib/postgresql/data" + - "./data/postgres_data:/var/lib/postgresql/data" network_mode: "host" image: packmate-db:v1 restart: unless-stopped diff --git a/frontend b/frontend index ef7e8a4..9ff0cef 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit ef7e8a40b10d74ce05535022bb4f8cd0142c7915 +Subproject commit 9ff0cefd57a40d515d1b729b014a6a887b5bce04 diff --git a/src/main/java/ru/serega6531/packmate/service/StreamService.java b/src/main/java/ru/serega6531/packmate/service/StreamService.java index 44d331d..9851c56 100644 --- a/src/main/java/ru/serega6531/packmate/service/StreamService.java +++ b/src/main/java/ru/serega6531/packmate/service/StreamService.java @@ -139,6 +139,7 @@ public class StreamService { } } + log.info("Finished lookback for pattern '{}'", pattern.getName()); subscriptionService.broadcast(new SubscriptionMessage(SubscriptionMessageType.FINISH_LOOKBACK, pattern.getId())); }