Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make logrotate_fs a generator #1066

Merged
merged 9 commits into from
Oct 29, 2024
Merged

Make logrotate_fs a generator #1066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
95f40c8
Make logrotate_fs a generator
blt Oct 26, 2024
f92c433
correct tests
blt Oct 28, 2024
0b0ffbf
add more telemetry
blt Oct 28, 2024
41a7d7d
correctly backfill new_file with bytes
blt Oct 28, 2024
a2ff5bf
track max_offset_observed not just bytes_read, duplicate reads
blt Oct 28, 2024
acfa0da
add created time to file, address bytes written property check fail
blt Oct 28, 2024
f86d308
clippy fixes
blt Oct 28, 2024
0735cf3
install necessary lib in main container
blt Oct 29, 2024
18ee493
pin package version
blt Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ COPY . /app
RUN cargo build --release --locked --bin lading

FROM docker.io/debian:bullseye-20240701-slim
RUN apt-get update && apt-get install -y libfuse3-dev=3.10.3-2 && rm -rf /var/lib/apt/lists/*
COPY --from=builder /app/target/release/lading /usr/bin/lading

# smoke test
Expand Down
13 changes: 12 additions & 1 deletion lading/src/generator/file_gen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
//!

pub mod logrotate;
pub mod model;
pub mod logrotate_fs;
pub mod traditional;

use std::str;
Expand All @@ -31,6 +31,9 @@ pub enum Error {
/// Wrapper around [`logrotate::Error`].
#[error(transparent)]
Logrotate(#[from] logrotate::Error),
/// Wrapper around [`logrotate_fs::Error`].
#[error(transparent)]
LogrotateFs(#[from] logrotate_fs::Error),
}

/// Configuration of [`FileGen`]
Expand All @@ -42,6 +45,8 @@ pub enum Config {
Traditional(traditional::Config),
/// See [`logrotate::Config`].
Logrotate(logrotate::Config),
/// See [`logrotate_fs::Config`].
LogrotateFs(logrotate_fs::Config),
}

#[derive(Debug)]
Expand All @@ -54,6 +59,8 @@ pub enum FileGen {
Traditional(traditional::Server),
/// See [`logrotate::Server`] for details.
Logrotate(logrotate::Server),
/// See [`logrotate_fs::Server`] for details.
LogrotateFs(logrotate_fs::Server),
}

impl FileGen {
Expand All @@ -78,6 +85,9 @@ impl FileGen {
Self::Traditional(traditional::Server::new(general, c, shutdown)?)
}
Config::Logrotate(c) => Self::Logrotate(logrotate::Server::new(general, c, shutdown)?),
Config::LogrotateFs(c) => {
Self::LogrotateFs(logrotate_fs::Server::new(general, c, shutdown)?)
}
};
Ok(srv)
}
Expand All @@ -98,6 +108,7 @@ impl FileGen {
match self {
Self::Traditional(inner) => inner.spin().await?,
Self::Logrotate(inner) => inner.spin().await?,
Self::LogrotateFs(inner) => inner.spin().await?,
};

Ok(())
Expand Down
Loading
Loading