From abf58afe3a0f1b4606b2efa9b0886085198ffa21 Mon Sep 17 00:00:00 2001 From: djklim87 Date: Tue, 16 Sep 2025 12:42:13 +0200 Subject: [PATCH] Fix: QUERY_LOG_TO_STDOUT must be set to true or 1 to enable query logging Ref: #119 --- clt_tests/tests/query_log_to_stdout.rec | 119 +++++++++++++++++++++++- docker-entrypoint.sh | 2 +- 2 files changed, 119 insertions(+), 2 deletions(-) diff --git a/clt_tests/tests/query_log_to_stdout.rec b/clt_tests/tests/query_log_to_stdout.rec index 3182a64..9738c40 100644 --- a/clt_tests/tests/query_log_to_stdout.rec +++ b/clt_tests/tests/query_log_to_stdout.rec @@ -13,4 +13,121 @@ docker exec manticore mysql -e "CREATE TABLE a; SELECT * FROM a;" ––– input ––– docker logs manticore | grep "SELECT \* FROM a;" ––– output ––– -/* #!/[A-Za-z]+/!# #!/[A-Za-z]+/!# %{NUMBER} #!/[0-9]{2}:[0-9]{2}:[0-9]{2}\.[0-9]{3}/!# %{YEAR} conn %{NUMBER} ((local)) real #!/[0-9]{1}\.[0-9]{3}/!# wall #!/[0-9]{1}\.[0-9]{3}/!# found %{NUMBER} */ SELECT * FROM a; \ No newline at end of file +/* #!/[A-Za-z]+/!# #!/[A-Za-z]+/!# %{NUMBER} #!/[0-9]{2}:[0-9]{2}:[0-9]{2}\.[0-9]{3}/!# %{YEAR} conn %{NUMBER} ((local)) real #!/[0-9]{1}\.[0-9]{3}/!# wall #!/[0-9]{1}\.[0-9]{3}/!# found %{NUMBER} */ SELECT * FROM a; +––– input ––– +docker stop manticore && docker rm manticore +––– output ––– +#!/[0-9a-z]+/!# +#!/[0-9a-z]+/!# +––– input ––– +docker run -d -e QUERY_LOG_TO_STDOUT=1 --name manticore manticoresoftware/manticore:current +––– output ––– +#!/[0-9a-z]+/!# +––– input ––– +if timeout 60 grep -qm1 'accepting connections' <(docker logs -f manticore); then echo 'accepting connections'; else echo 'Timeout failed'; fi +––– output ––– +accepting connections +––– input ––– +docker exec manticore mysql -e "CREATE TABLE a; SELECT * FROM a;" +––– output ––– +––– input ––– +docker logs manticore | grep "SELECT \* FROM a;" +––– output ––– +/* #!/[A-Za-z]+/!# #!/[A-Za-z]+/!# %{NUMBER} #!/[0-9]{2}:[0-9]{2}:[0-9]{2}\.[0-9]{3}/!# %{YEAR} conn %{NUMBER} ((local)) real #!/[0-9]{1}\.[0-9]{3}/!# wall #!/[0-9]{1}\.[0-9]{3}/!# found %{NUMBER} */ SELECT * FROM a; +––– input ––– +docker stop manticore && docker rm manticore +––– output ––– +#!/[0-9a-z]+/!# +#!/[0-9a-z]+/!# +––– input ––– +docker run -d -e QUERY_LOG_TO_STDOUT="true" --name manticore manticoresoftware/manticore:current +––– output ––– +#!/[0-9a-z]+/!# +––– input ––– +if timeout 60 grep -qm1 'accepting connections' <(docker logs -f manticore); then echo 'accepting connections'; else echo 'Timeout failed'; fi +––– output ––– +accepting connections +––– input ––– +docker exec manticore mysql -e "CREATE TABLE a; SELECT * FROM a;" +––– output ––– +––– input ––– +docker logs manticore | grep "SELECT \* FROM a;" +––– output ––– +/* #!/[A-Za-z]+/!# #!/[A-Za-z]+/!# %{NUMBER} #!/[0-9]{2}:[0-9]{2}:[0-9]{2}\.[0-9]{3}/!# %{YEAR} conn %{NUMBER} ((local)) real #!/[0-9]{1}\.[0-9]{3}/!# wall #!/[0-9]{1}\.[0-9]{3}/!# found %{NUMBER} */ SELECT * FROM a; +––– input ––– +docker stop manticore && docker rm manticore +––– output ––– +#!/[0-9a-z]+/!# +#!/[0-9a-z]+/!# +––– input ––– +docker run -d -e QUERY_LOG_TO_STDOUT="1" --name manticore manticoresoftware/manticore:current +––– output ––– +#!/[0-9a-z]+/!# +––– input ––– +if timeout 60 grep -qm1 'accepting connections' <(docker logs -f manticore); then echo 'accepting connections'; else echo 'Timeout failed'; fi +––– output ––– +accepting connections +––– input ––– +docker exec manticore mysql -e "CREATE TABLE a; SELECT * FROM a;" +––– output ––– +––– input ––– +docker logs manticore | grep "SELECT \* FROM a;" +––– output ––– +/* #!/[A-Za-z]+/!# #!/[A-Za-z]+/!# %{NUMBER} #!/[0-9]{2}:[0-9]{2}:[0-9]{2}\.[0-9]{3}/!# %{YEAR} conn %{NUMBER} ((local)) real #!/[0-9]{1}\.[0-9]{3}/!# wall #!/[0-9]{1}\.[0-9]{3}/!# found %{NUMBER} */ SELECT * FROM a; +––– input ––– +docker stop manticore && docker rm manticore +––– output ––– +#!/[0-9a-z]+/!# +#!/[0-9a-z]+/!# +––– input ––– +docker run -d -e QUERY_LOG_TO_STDOUT=false --name manticore manticoresoftware/manticore:current +––– output ––– +#!/[0-9a-z]+/!# +––– input ––– +if timeout 60 grep -qm1 'accepting connections' <(docker logs -f manticore); then echo 'accepting connections'; else echo 'Timeout failed'; fi +––– output ––– +accepting connections +––– input ––– +docker exec manticore mysql -e "CREATE TABLE a; SELECT * FROM a;" +––– output ––– +––– input ––– +docker logs manticore | grep "SELECT \* FROM a;" +––– output ––– +––– input ––– +docker stop manticore && docker rm manticore +––– output ––– +#!/[0-9a-z]+/!# +#!/[0-9a-z]+/!# +––– input ––– +docker run -d -e QUERY_LOG_TO_STDOUT=abc --name manticore manticoresoftware/manticore:current +––– output ––– +#!/[0-9a-z]+/!# +––– input ––– +if timeout 60 grep -qm1 'accepting connections' <(docker logs -f manticore); then echo 'accepting connections'; else echo 'Timeout failed'; fi +––– output ––– +accepting connections +––– input ––– +docker exec manticore mysql -e "CREATE TABLE a; SELECT * FROM a;" +––– output ––– +––– input ––– +docker logs manticore | grep "SELECT \* FROM a;" +––– output ––– +––– input ––– +docker stop manticore && docker rm manticore +––– output ––– +#!/[0-9a-z]+/!# +#!/[0-9a-z]+/!# +––– input ––– +docker run -d --name manticore manticoresoftware/manticore:current +––– output ––– +#!/[0-9a-z]+/!# +––– input ––– +if timeout 60 grep -qm1 'accepting connections' <(docker logs -f manticore); then echo 'accepting connections'; else echo 'Timeout failed'; fi +––– output ––– +accepting connections +––– input ––– +docker exec manticore mysql -e "CREATE TABLE a; SELECT * FROM a;" +––– output ––– +––– input ––– +docker logs manticore | grep "SELECT \* FROM a;" +––– output ––– diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 76e4b9d..d31a5b5 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -26,7 +26,7 @@ docker_setup_env() { RED='\033[0;31m' NC='\033[0m' # No Color - if [ -n "$QUERY_LOG_TO_STDOUT" ]; then + if [ "$QUERY_LOG_TO_STDOUT" = "true" ] || [ "$QUERY_LOG_TO_STDOUT" = "1" ]; then export searchd_query_log=/var/log/manticore/query.log [ ! -f /var/log/manticore/query.log ] && ln -sf /dev/stdout /var/log/manticore/query.log fi