From 4461d1ea3f494778f07041164f6b8a252bd26ea2 Mon Sep 17 00:00:00 2001
From: notgne2
Date: Sun, 27 Dec 2020 10:48:18 -0700
Subject: Replace logger, add more logging options including files

---
 src/main.rs | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

(limited to 'src/main.rs')

diff --git a/src/main.rs b/src/main.rs
index be7ad40..c003da7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -12,8 +12,6 @@ use tokio::process::Command;
 
 use thiserror::Error;
 
-extern crate pretty_env_logger;
-
 #[macro_use]
 extern crate log;
 
@@ -39,6 +37,13 @@ struct Opts {
     /// Extra arguments to be passed to nix build
     extra_build_args: Vec<String>,
 
+    /// Print debug logs to output
+    #[clap(short, long)]
+    debug_logs: bool,
+    /// Directory to print logs to (including the background activation process)
+    #[clap(long)]
+    log_dir: Option<String>,
+
     /// Keep the build outputs of each built profile
     #[clap(short, long)]
     keep_result: bool,
@@ -336,6 +341,8 @@ async fn run_deploy(
     keep_result: bool,
     result_path: Option<&str>,
     extra_build_args: &[String],
+    debug_logs: bool,
+    log_dir: Option<String>,
 ) -> Result<(), RunDeployError> {
     let to_deploy: Vec<((&str, &utils::data::Node), (&str, &utils::data::Profile))> =
         match (&deploy_flake.node, &deploy_flake.profile) {
@@ -432,6 +439,8 @@ async fn run_deploy(
             profile,
             profile_name,
             &cmd_overrides,
+            debug_logs,
+            log_dir.as_deref(),
         );
 
         let deploy_defs = deploy_data.defs()?;
@@ -480,19 +489,17 @@ enum RunError {
     GetDeploymentDataError(#[from] GetDeploymentDataError),
     #[error("Error parsing flake: {0}")]
     ParseFlakeError(#[from] utils::ParseFlakeError),
+    #[error("Error initiating logger: {0}")]
+    LoggerError(#[from] flexi_logger::FlexiLoggerError),
     #[error("{0}")]
     RunDeployError(#[from] RunDeployError),
 }
 
 async fn run() -> Result<(), RunError> {
-    if std::env::var("DEPLOY_LOG").is_err() {
-        std::env::set_var("DEPLOY_LOG", "info");
-    }
-
-    pretty_env_logger::init_custom_env("DEPLOY_LOG");
-
     let opts: Opts = Opts::parse();
 
+    utils::init_logger(opts.debug_logs, opts.log_dir.as_deref(), false)?;
+
     let deploy_flake = utils::parse_flake(opts.flake.as_str())?;
 
     let cmd_overrides = utils::CmdOverrides {
@@ -534,6 +541,8 @@ async fn run() -> Result<(), RunError> {
         opts.keep_result,
         result_path,
         &opts.extra_build_args,
+        opts.debug_logs,
+        opts.log_dir,
     )
     .await?;
 
-- 
cgit v1.2.3


From 40d71ccdd715c6008de1a0bb97ed11282a8fe61c Mon Sep 17 00:00:00 2001
From: notgne2
Date: Sun, 27 Dec 2020 13:04:54 -0700
Subject: Make printed deployment information be info level instead of warn

---
 src/main.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main.rs')

diff --git a/src/main.rs b/src/main.rs
index c003da7..6783c40 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -247,7 +247,7 @@ fn print_deployment(
 
     let toml = toml::to_string(&part_map)?;
 
-    warn!("The following profiles are going to be deployed:\n{}", toml);
+    info!("The following profiles are going to be deployed:\n{}", toml);
 
     Ok(())
 }
-- 
cgit v1.2.3


From b6a6abe104d348ba696054c930a3dafe0edf8d00 Mon Sep 17 00:00:00 2001
From: notgne2
Date: Wed, 30 Dec 2020 20:25:59 -0700
Subject: Modify activation logic to keep SSH connection alive for
 magic-rollback and avoid forking or disconnecting std{out,err}

---
 src/main.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/main.rs')

diff --git a/src/main.rs b/src/main.rs
index 6783c40..1544fed 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -498,7 +498,11 @@ enum RunError {
 async fn run() -> Result<(), RunError> {
     let opts: Opts = Opts::parse();
 
-    utils::init_logger(opts.debug_logs, opts.log_dir.as_deref(), false)?;
+    utils::init_logger(
+        opts.debug_logs,
+        opts.log_dir.as_deref(),
+        utils::LoggerType::Deploy,
+    )?;
 
     let deploy_flake = utils::parse_flake(opts.flake.as_str())?;
 
-- 
cgit v1.2.3