Apr 18, 2024 · Jun 10, 2024 · Jun 13, 2024 · Sep 13, 2024 · Sep 18, 2024 · Sep 18, 2024
diff --git a/src/cli.rs b/src/cli.rs
    boot: bool,
    log_dir: &Option<String>,
    rollback_succeeded: bool,
    mp: MultiProgress,
 ) -> Result<(), RunDeployError> {
    let to_deploy: ToDeploy = deploy_flakes
        .iter()
            });

    // show progress information
    let mp = MultiProgress::new();
    let remote_mp = mp.clone();
    let new_spinner = || ProgressBar::new_spinner().with_style(ProgressStyle::with_template("{spinner:.blue} {prefix} {msg}").unwrap().tick_strings(&["⢎ ", "⠎⠁", "⠊⠑", "⠈⠱", " ⡱", "⢀⡰", "⢄⡠", "⢆⡀"]));
    let new_spinner = || ProgressBar::new_spinner().with_style(ProgressStyle::with_template("{spinner:.blue} {prefix} {msg}").expect("invalid template").tick_strings(&["⢎ ", "⠎⠁", "⠊⠑", "⠈⠱", " ⡱", "⢀⡰", "⢄⡠", "⢆⡀"]));

    let (_remote_results, local_results) = join!(
        // remote builds can be run asynchronously
        None => Opts::parse(),
    };

    deploy::init_logger(
 let (mp, _handle) =deploy::init_logger(
        opts.debug_logs,
        opts.log_dir.as_deref(),
        &deploy::LoggerType::Deploy,
        opts.boot,
        &opts.log_dir,
        opts.rollback_succeeded.unwrap_or(true),
        mp
    )
    .await?;

diff --git a/src/lib.rs b/src/lib.rs
 //
 // SPDX-License-Identifier: MPL-2.0

 use indicatif::MultiProgress;
 use rnix::{types::*, SyntaxKind::*};

 use merge::Merge;
    Revoke,
 }

 use log::Log;

 pub struct LogWrapper {
    bar: MultiProgress,
    log: Box<dyn Log>,
 }

 impl LogWrapper {
    pub fn new(bar: MultiProgress, log: Box<dyn Log>) -> Self {
        Self { bar, log }
    }

    pub fn try_init(self) -> Result<(), log::SetLoggerError> {
        use log::LevelFilter::*;
        let levels = [Off, Error, Warn, Info, Debug, Trace];

        for level_filter in levels.iter().rev() {
            let level = if let Some(level) = level_filter.to_level() {
                level
            } else {
                continue;
            };
            let meta = log::Metadata::builder().level(level).build();
            if self.enabled(&meta) {
                log::set_max_level(*level_filter);
                break;
            }
        }

        log::set_boxed_logger(Box::new(self))
    }
    pub fn multi(&self) -> MultiProgress {
        self.bar.clone()
    }
 }

 impl Log for LogWrapper {
    fn enabled(&self, metadata: &log::Metadata) -> bool {
        self.log.enabled(metadata)
    }

    fn log(&self, record: &log::Record) {
        if self.log.enabled(record.metadata()) {
            self.bar.suspend(|| self.log.log(record))
        }
    }

    fn flush(&self) {
        self.log.flush()
    }
 }

 pub fn init_logger(
    debug_logs: bool,
    log_dir: Option<&str>,
    logger_type: &LoggerType,
 ) -> Result<(), FlexiLoggerError> {
 ) -> Result<(MultiProgress, ReconfigurationHandle), FlexiLoggerError> {
    let logger_formatter = match &logger_type {
        LoggerType::Deploy => logger_formatter_deploy,
        LoggerType::Activate => logger_formatter_activate,
        LoggerType::Wait => logger_formatter_wait,
        LoggerType::Revoke => logger_formatter_revoke,
    };

    if let Some(log_dir) = log_dir {
 let (logger, handle) =if let Some(log_dir) = log_dir {
        let mut logger = Logger::with_env_or_str("debug")
            .log_to_file()
            .format_for_stderr(logger_formatter)
            LoggerType::Deploy => (),
        }

        logger.start()?;
        logger.build()?
    } else {
        Logger::with_env_or_str(match debug_logs {
            true => "debug",
        .log_target(LogTarget::StdErr)
        .format(logger_formatter)
        .set_palette("196;208;51;7;8".to_string())
        .start()?;
    }
        .build()?
    };

    let multi = MultiProgress::new();
    LogWrapper::new(multi.clone(), logger).try_init().unwrap();

    Ok(())
    Ok((multi, handle))
 }

 pub mod cli;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -431,6 +431,7 @@ async fn run_deploy(
		boot: bool,
		log_dir: &Option<String>,
		rollback_succeeded: bool,
		mp: MultiProgress,
		) -> Result<(), RunDeployError> {
		let to_deploy: ToDeploy = deploy_flakes
		.iter()
Expand DownExpand Up		@@ -618,9 +619,8 @@ async fn run_deploy(
		});

		// show progress information
		let mp = MultiProgress::new();
		let remote_mp = mp.clone();
		let new_spinner = \|\| ProgressBar::new_spinner().with_style(ProgressStyle::with_template("{spinner:.blue} {prefix} {msg}").unwrap().tick_strings(&["⢎ ", "⠎⠁", "⠊⠑", "⠈⠱", " ⡱", "⢀⡰", "⢄⡠", "⢆⡀"]));
		let new_spinner = \|\| ProgressBar::new_spinner().with_style(ProgressStyle::with_template("{spinner:.blue} {prefix} {msg}").expect("invalid template").tick_strings(&["⢎ ", "⠎⠁", "⠊⠑", "⠈⠱", " ⡱", "⢀⡰", "⢄⡠", "⢆⡀"]));

		let (_remote_results, local_results) = join!(
		// remote builds can be run asynchronously
Expand DownExpand Up		@@ -765,7 +765,7 @@ pub async fn run(args: Option<&ArgMatches>) -> Result<(), RunError> {
		None => Opts::parse(),
		};

		deploy::init_logger(
		let (mp, _handle) =deploy::init_logger(
		opts.debug_logs,
		opts.log_dir.as_deref(),
		&deploy::LoggerType::Deploy,
Expand DownExpand Up		@@ -830,6 +830,7 @@ pub async fn run(args: Option<&ArgMatches>) -> Result<(), RunError> {
		opts.boot,
		&opts.log_dir,
		opts.rollback_succeeded.unwrap_or(true),
		mp
		)
		.await?;

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,6 +4,7 @@
		//
		// SPDX-License-Identifier: MPL-2.0

		use indicatif::MultiProgress;
		use rnix::{types::, SyntaxKind::};

		use merge::Merge;
Expand DownExpand Up		@@ -101,19 +102,71 @@ pub enum LoggerType {
		Revoke,
		}

		use log::Log;

		pub struct LogWrapper {
		bar: MultiProgress,
		log: Box<dyn Log>,
		}

		impl LogWrapper {
		pub fn new(bar: MultiProgress, log: Box<dyn Log>) -> Self {
		Self { bar, log }
		}

		pub fn try_init(self) -> Result<(), log::SetLoggerError> {
		use log::LevelFilter::*;
		let levels = [Off, Error, Warn, Info, Debug, Trace];

		for level_filter in levels.iter().rev() {
		let level = if let Some(level) = level_filter.to_level() {
		level
		} else {
		continue;
		};
		let meta = log::Metadata::builder().level(level).build();
		if self.enabled(&meta) {
		log::set_max_level(*level_filter);
		break;
		}
		}

		log::set_boxed_logger(Box::new(self))
		}
		pub fn multi(&self) -> MultiProgress {
		self.bar.clone()
		}
		}

		impl Log for LogWrapper {
		fn enabled(&self, metadata: &log::Metadata) -> bool {
		self.log.enabled(metadata)
		}

		fn log(&self, record: &log::Record) {
		if self.log.enabled(record.metadata()) {
		self.bar.suspend(\|\| self.log.log(record))
		}
		}

		fn flush(&self) {
		self.log.flush()
		}
		}

		pub fn init_logger(
		debug_logs: bool,
		log_dir: Option<&str>,
		logger_type: &LoggerType,
		) -> Result<(), FlexiLoggerError> {
		) -> Result<(MultiProgress, ReconfigurationHandle), FlexiLoggerError> {
		let logger_formatter = match &logger_type {
		LoggerType::Deploy => logger_formatter_deploy,
		LoggerType::Activate => logger_formatter_activate,
		LoggerType::Wait => logger_formatter_wait,
		LoggerType::Revoke => logger_formatter_revoke,
		};

		if let Some(log_dir) = log_dir {
		let (logger, handle) =if let Some(log_dir) = log_dir {
		let mut logger = Logger::with_env_or_str("debug")
		.log_to_file()
		.format_for_stderr(logger_formatter)
Expand All		@@ -132,7 +185,7 @@ pub fn init_logger(
		LoggerType::Deploy => (),
		}

		logger.start()?;
		logger.build()?
		} else {
		Logger::with_env_or_str(match debug_logs {
		true => "debug",
Expand All		@@ -141,10 +194,13 @@ pub fn init_logger(
		.log_target(LogTarget::StdErr)
		.format(logger_formatter)
		.set_palette("196;208;51;7;8".to_string())
		.start()?;
		}
		.build()?
		};

		let multi = MultiProgress::new();
		LogWrapper::new(multi.clone(), logger).try_init().unwrap();

		Ok(())
		Ok((multi, handle))
		}

		pub mod cli;
Expand Down