From 73a502473c03165bf3000a3704d03f954838ce7e Mon Sep 17 00:00:00 2001 From: Gints Polis Date: Sat, 24 Jan 2026 21:14:41 +0200 Subject: [PATCH 1/2] #18 Add additional filter values for system --- src/filters/system_filter.rs | 5 ++++- tests/files/system_test.log | 5 +++++ tests/system.rs | 17 +++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 tests/files/system_test.log create mode 100644 tests/system.rs diff --git a/src/filters/system_filter.rs b/src/filters/system_filter.rs index 9ce3913..f2dcdec 100644 --- a/src/filters/system_filter.rs +++ b/src/filters/system_filter.rs @@ -24,11 +24,13 @@ impl SystemFilter { b"walsender", b"archiver", // Startup / shutdown + b"starting PostgreSQL", b"database system is starting", b"database system is ready", b"database system is shutting down", b"startup process", - b"shutdown", + b"shut down", + b"listening", // Configuration changes b"reloading configuration", b"configuration file", @@ -71,6 +73,7 @@ mod test { (b"Database system is starting up", true), (b"Reloading configuration file", true), (b"Creating extension pg_stat_statements", true), + (b"listening on IPv4 address \"127.0.0.1\", port 54316", true), (b"This is a normal log message", false), (b"User logged in successfully", false), ]; diff --git a/tests/files/system_test.log b/tests/files/system_test.log new file mode 100644 index 0000000..5bce94d --- /dev/null +++ b/tests/files/system_test.log @@ -0,0 +1,5 @@ +2025-08-27 01:24:18.975 EEST [3863217] LOG: starting PostgreSQL 16.10 (Ubuntu 16.10-1.pgdg24.04+1) on x86_64-pc-linux-gnu, compiled by gcc (Ubuntu 13.3.0-6ubuntu2~24.04) 13.3.0, 64-bit +2025-08-27 01:24:18.975 EEST [3863217] LOG: listening on IPv4 address "127.0.0.1", port 54316 +2025-08-27 01:24:18.978 EEST [3863217] LOG: listening on Unix socket "/tmp/.s.PGSQL.54316" +2025-08-27 01:24:18.982 EEST [3863221] LOG: database system was shut down at 2025-08-27 01:23:49 EEST +2025-08-27 01:24:18.987 EEST [3863217] LOG: database system is ready to accept connections \ No newline at end of file diff --git a/tests/system.rs b/tests/system.rs new file mode 100644 index 0000000..d30def9 --- /dev/null +++ b/tests/system.rs @@ -0,0 +1,17 @@ +use assert_cmd::cargo; +use assert_cmd::prelude::*; +use predicates::prelude::PredicateBooleanExt; +use std::process::Command; // Run programs + +#[test] +fn simple_log_system() -> Result<(), Box> { + let mut cmd = Command::new(cargo::cargo_bin!("pgweasel")); + + cmd.args(["system", "./tests/files/system_test.log"]) + .assert() + .success() + .stdout( + predicates::str::contains("listening").and(predicates::str::contains("was shut down")), + ); + Ok(()) +} From 6ae2ec50b60fa7ccf76760f98650bbfb8ccd6e30 Mon Sep 17 00:00:00 2001 From: Kaarel Moppel Date: Fri, 30 Jan 2026 23:33:39 +0200 Subject: [PATCH 2/2] Minor SystemFilter improvement - listening -> listening on --- src/filters/system_filter.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/filters/system_filter.rs b/src/filters/system_filter.rs index f2dcdec..0d3454c 100644 --- a/src/filters/system_filter.rs +++ b/src/filters/system_filter.rs @@ -30,7 +30,7 @@ impl SystemFilter { b"database system is shutting down", b"startup process", b"shut down", - b"listening", + b"listening on ", // Configuration changes b"reloading configuration", b"configuration file",