Skip to content

Commit 913c99b

Browse files
authored
Make logrotate_fs a generator (#1066)
### What does this PR do? This commit migrates logrotate_fs to be a generator and not a stand-alone binary. While I think it is interesting to consider logrotate_fs as a user defined generator that's more of a rig that needs to be developed than I would like to for this project.
1 parent d33ceea commit 913c99b

File tree

4 files changed

+274
-233
lines changed

4 files changed

+274
-233
lines changed

Diff for: Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ COPY . /app
1010
RUN cargo build --release --locked --bin lading
1111

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

1516
# smoke test

Diff for: lading/src/generator/file_gen.rs

+12-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
//!
1414
1515
pub mod logrotate;
16-
pub mod model;
16+
pub mod logrotate_fs;
1717
pub mod traditional;
1818

1919
use std::str;
@@ -31,6 +31,9 @@ pub enum Error {
3131
/// Wrapper around [`logrotate::Error`].
3232
#[error(transparent)]
3333
Logrotate(#[from] logrotate::Error),
34+
/// Wrapper around [`logrotate_fs::Error`].
35+
#[error(transparent)]
36+
LogrotateFs(#[from] logrotate_fs::Error),
3437
}
3538

3639
/// Configuration of [`FileGen`]
@@ -42,6 +45,8 @@ pub enum Config {
4245
Traditional(traditional::Config),
4346
/// See [`logrotate::Config`].
4447
Logrotate(logrotate::Config),
48+
/// See [`logrotate_fs::Config`].
49+
LogrotateFs(logrotate_fs::Config),
4550
}
4651

4752
#[derive(Debug)]
@@ -54,6 +59,8 @@ pub enum FileGen {
5459
Traditional(traditional::Server),
5560
/// See [`logrotate::Server`] for details.
5661
Logrotate(logrotate::Server),
62+
/// See [`logrotate_fs::Server`] for details.
63+
LogrotateFs(logrotate_fs::Server),
5764
}
5865

5966
impl FileGen {
@@ -78,6 +85,9 @@ impl FileGen {
7885
Self::Traditional(traditional::Server::new(general, c, shutdown)?)
7986
}
8087
Config::Logrotate(c) => Self::Logrotate(logrotate::Server::new(general, c, shutdown)?),
88+
Config::LogrotateFs(c) => {
89+
Self::LogrotateFs(logrotate_fs::Server::new(general, c, shutdown)?)
90+
}
8191
};
8292
Ok(srv)
8393
}
@@ -98,6 +108,7 @@ impl FileGen {
98108
match self {
99109
Self::Traditional(inner) => inner.spin().await?,
100110
Self::Logrotate(inner) => inner.spin().await?,
111+
Self::LogrotateFs(inner) => inner.spin().await?,
101112
};
102113

103114
Ok(())

0 commit comments

Comments
 (0)