diff --git a/Cargo.lock b/Cargo.lock index 46e8c1be..49f9603d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3790,7 +3790,7 @@ dependencies = [ ] [[package]] -name = "kumo-log-tailer" +name = "kumo-jsonl" version = "0.1.0" dependencies = [ "anyhow", @@ -3900,7 +3900,7 @@ dependencies = [ "human_bytes", "k9", "kumo-api-types", - "kumo-log-tailer", + "kumo-jsonl", "kumo-machine-info", "kumo-prometheus", "kumo-server-lifecycle", @@ -7918,7 +7918,7 @@ dependencies = [ "clap", "futures", "humantime", - "kumo-log-tailer", + "kumo-jsonl", "tokio", ] diff --git a/Cargo.toml b/Cargo.toml index 807ac5b2..c512afa2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ members = [ "crates/kumo-api-client", "crates/kumo-chrono-helper", "crates/kumo-counter-series", - "crates/kumo-log-tailer", + "crates/kumo-jsonl", "crates/kumo-dmarc", "crates/kumo-machine-info", "crates/kumo-prometheus", diff --git a/crates/kumo-log-tailer/Cargo.toml b/crates/kumo-jsonl/Cargo.toml similarity index 98% rename from crates/kumo-log-tailer/Cargo.toml rename to crates/kumo-jsonl/Cargo.toml index 842859df..234ad730 100644 --- a/crates/kumo-log-tailer/Cargo.toml +++ b/crates/kumo-jsonl/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "kumo-log-tailer" +name = "kumo-jsonl" version = "0.1.0" edition = "2021" diff --git a/crates/kumo-log-tailer/src/batch.rs b/crates/kumo-jsonl/src/batch.rs similarity index 100% rename from crates/kumo-log-tailer/src/batch.rs rename to crates/kumo-jsonl/src/batch.rs diff --git a/crates/kumo-log-tailer/src/checkpoint.rs b/crates/kumo-jsonl/src/checkpoint.rs similarity index 100% rename from crates/kumo-log-tailer/src/checkpoint.rs rename to crates/kumo-jsonl/src/checkpoint.rs diff --git a/crates/kumo-log-tailer/src/decompress.rs b/crates/kumo-jsonl/src/decompress.rs similarity index 100% rename from crates/kumo-log-tailer/src/decompress.rs rename to crates/kumo-jsonl/src/decompress.rs diff --git a/crates/kumo-log-tailer/src/lib.rs b/crates/kumo-jsonl/src/lib.rs similarity index 100% rename from crates/kumo-log-tailer/src/lib.rs rename to crates/kumo-jsonl/src/lib.rs diff --git a/crates/kumo-log-tailer/src/lua.rs b/crates/kumo-jsonl/src/lua.rs similarity index 100% rename from crates/kumo-log-tailer/src/lua.rs rename to crates/kumo-jsonl/src/lua.rs diff --git a/crates/kumo-log-tailer/src/tailer.rs b/crates/kumo-jsonl/src/tailer.rs similarity index 100% rename from crates/kumo-log-tailer/src/tailer.rs rename to crates/kumo-jsonl/src/tailer.rs diff --git a/crates/kumo-log-tailer/src/writer.rs b/crates/kumo-jsonl/src/writer.rs similarity index 100% rename from crates/kumo-log-tailer/src/writer.rs rename to crates/kumo-jsonl/src/writer.rs diff --git a/crates/kumo-log-tailer/tests/integration.rs b/crates/kumo-jsonl/tests/integration.rs similarity index 99% rename from crates/kumo-log-tailer/tests/integration.rs rename to crates/kumo-jsonl/tests/integration.rs index 6612b6ce..74223724 100644 --- a/crates/kumo-log-tailer/tests/integration.rs +++ b/crates/kumo-jsonl/tests/integration.rs @@ -1,6 +1,6 @@ use camino::Utf8PathBuf; use futures::StreamExt; -use kumo_log_tailer::{ +use kumo_jsonl::{ ConsumerConfig, LogBatch, LogTailer, LogTailerConfig, LogWriter, LogWriterConfig, MultiConsumerTailerConfig, }; diff --git a/crates/kumo-log-tailer/tests/lua_integration.rs b/crates/kumo-jsonl/tests/lua_integration.rs similarity index 99% rename from crates/kumo-log-tailer/tests/lua_integration.rs rename to crates/kumo-jsonl/tests/lua_integration.rs index 0eb07653..d05ae825 100644 --- a/crates/kumo-log-tailer/tests/lua_integration.rs +++ b/crates/kumo-jsonl/tests/lua_integration.rs @@ -1,7 +1,7 @@ #![cfg(feature = "lua")] use camino::Utf8PathBuf; -use kumo_log_tailer::LogWriterConfig; +use kumo_jsonl::LogWriterConfig; use mlua::Lua; use tempfile::TempDir; @@ -21,7 +21,7 @@ fn write_segment(dir: &std::path::Path, records: &[&str]) { /// Run a lua script in a fresh Lua state with the tailer module registered. async fn run_lua(script: &str) -> mlua::Result<()> { let lua = Lua::new(); - kumo_log_tailer::lua::register(&lua).unwrap(); + kumo_jsonl::lua::register(&lua).unwrap(); // Make the kumo module accessible as a global (normally done by // the kumomta config loader). let package: mlua::Table = lua.globals().get("package")?; diff --git a/crates/kumo-server-common/Cargo.toml b/crates/kumo-server-common/Cargo.toml index 6ba046b0..2a13fe15 100644 --- a/crates/kumo-server-common/Cargo.toml +++ b/crates/kumo-server-common/Cargo.toml @@ -55,7 +55,7 @@ mod-redis = {path="../mod-redis"} mod-serde = {path="../mod-serde"} mod-smtp-response-normalize = {path="../mod-smtp-response-normalize"} mod-sqlite = {path="../mod-sqlite"} -kumo-log-tailer = {path="../kumo-log-tailer", features=["lua"]} +kumo-jsonl = {path="../kumo-jsonl", features=["lua"]} mod-string = {path="../mod-string"} mod-time = {path="../mod-time"} mod-uuid = {path="../mod-uuid"} diff --git a/crates/kumo-server-common/src/lib.rs b/crates/kumo-server-common/src/lib.rs index 862f2c0d..65805a6b 100644 --- a/crates/kumo-server-common/src/lib.rs +++ b/crates/kumo-server-common/src/lib.rs @@ -39,7 +39,7 @@ pub fn register(lua: &Lua) -> anyhow::Result<()> { mod_sqlite::register, mod_crypto::register, mod_smtp_response_normalize::register, - kumo_log_tailer::lua::register, + kumo_jsonl::lua::register, mod_string::register, mod_time::register, mod_dns_resolver::register, diff --git a/crates/tailer/Cargo.toml b/crates/tailer/Cargo.toml index 8e6a5faf..a1fca390 100644 --- a/crates/tailer/Cargo.toml +++ b/crates/tailer/Cargo.toml @@ -9,5 +9,5 @@ camino = {workspace=true} clap = {workspace=true} futures = {workspace=true} humantime = {workspace=true} -kumo-log-tailer = {path="../kumo-log-tailer"} +kumo-jsonl = {path="../kumo-jsonl"} tokio = {version="1.32", features=["rt-multi-thread", "macros"]} diff --git a/crates/tailer/src/main.rs b/crates/tailer/src/main.rs index c3399a01..b713bcd7 100644 --- a/crates/tailer/src/main.rs +++ b/crates/tailer/src/main.rs @@ -2,7 +2,7 @@ use anyhow::Context; use camino::Utf8PathBuf; use clap::Parser; use futures::StreamExt; -use kumo_log_tailer::LogTailerConfig; +use kumo_jsonl::LogTailerConfig; use std::time::Duration; /// Tail logs