From 8e18aeee394d1d2cdac5f801c6cde1dfed130388 Mon Sep 17 00:00:00 2001 From: NikitaUnisikhin Date: Wed, 13 Mar 2024 15:50:44 +0000 Subject: [PATCH] add logs --- .github/workflows/cmake.yml | 3 --- docker-compose-test.yml | 4 +--- docker/Dockerfile | 2 ++ docker/odyssey.conf | 8 +++++--- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 5acaca567..2f24dd89a 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -39,9 +39,6 @@ jobs: run: ./run-clang-format/run-clang-format.py -r --clang-format-executable clang-format-11 modules sources stress test third_party - name: Test - env: - CC: ${{ matrix.compiler }} - CC_FOR_BUILD: ${{ matrix.compiler }} run: make run_test - name: Prepare for release diff --git a/docker-compose-test.yml b/docker-compose-test.yml index 0dfb0a0ff..f49aa34dd 100644 --- a/docker-compose-test.yml +++ b/docker-compose-test.yml @@ -32,9 +32,7 @@ services: DB_PORT: "6432" DB_USER: "spqr-console" DB_NAME: "spqr-console" - networks: - od_net: - ipv4_address: 192.168.233.17 + network_mode: "host" networks: od_net: diff --git a/docker/Dockerfile b/docker/Dockerfile index d4131c94c..498c60b64 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -84,6 +84,8 @@ COPY ./docker/gorm /gorm COPY ./docker/entrypoint.sh /usr/local/bin/entrypoint.sh +RUN touch ./logs.txt + RUN chmod a+x /usr/local/bin/entrypoint.sh ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] diff --git a/docker/odyssey.conf b/docker/odyssey.conf index 45a8d5a5a..e5e4b31f8 100644 --- a/docker/odyssey.conf +++ b/docker/odyssey.conf @@ -25,13 +25,15 @@ unix_socket_dir "/tmp" unix_socket_mode "0644" log_format "%p %t %l [%i %s] (%c) %m\n" -log_debug no +log_debug yes log_config yes -log_session no -log_query no +log_session yes +log_query yes log_stats yes daemonize yes +log_file "./logs.txt" + locks_dir "/tmp/odyssey" graceful_die_on_errors yes enable_online_restart yes