aboutsummaryrefslogtreecommitdiff
path: root/src/utils/deploy.rs
diff options
context:
space:
mode:
authornotgne22020-12-27 10:48:18 -0700
committernotgne22020-12-27 10:52:37 -0700
commit4461d1ea3f494778f07041164f6b8a252bd26ea2 (patch)
tree85fc2196e5c6869947c5f2d92713ac2b3bde8e2b /src/utils/deploy.rs
parent91e934fd9e1e06044f75a3e3ad998813c2a90fb5 (diff)
Replace logger, add more logging options including files
Diffstat (limited to '')
-rw-r--r--src/utils/deploy.rs20
1 files changed, 18 insertions, 2 deletions
diff --git a/src/utils/deploy.rs b/src/utils/deploy.rs
index 14a44a0..3aced6c 100644
--- a/src/utils/deploy.rs
+++ b/src/utils/deploy.rs
@@ -16,6 +16,8 @@ fn build_activate_command(
temp_path: &Cow<str>,
confirm_timeout: u16,
magic_rollback: bool,
+ debug_logs: bool,
+ log_dir: Option<&str>,
) -> String {
let mut self_activate_command = format!(
"{}/activate-rs '{}' '{}' --temp-path {} --confirm-timeout {}",
@@ -30,6 +32,14 @@ fn build_activate_command(
self_activate_command = format!("{} --auto-rollback", self_activate_command);
}
+ if debug_logs {
+ self_activate_command = format!("{} --debug-logs", self_activate_command);
+ }
+
+ if let Some(log_dir) = log_dir {
+ self_activate_command = format!("{} --log-file {}", self_activate_command, log_dir);
+ }
+
if let Some(sudo_cmd) = &sudo {
self_activate_command = format!("{} {}", sudo_cmd, self_activate_command);
}
@@ -47,6 +57,8 @@ fn test_activation_command_builder() {
let temp_path = &"/tmp".into();
let confirm_timeout = 30;
let magic_rollback = true;
+ let debug_logs = true;
+ let log_dir = Some("/tmp/something.txt");
assert_eq!(
build_activate_command(
@@ -56,9 +68,11 @@ fn test_activation_command_builder() {
auto_rollback,
temp_path,
confirm_timeout,
- magic_rollback
+ magic_rollback,
+ debug_logs,
+ log_dir
),
- "sudo -u test /nix/store/blah/etc/activate-rs '/blah/profiles/test' '/nix/store/blah/etc' --temp-path /tmp --confirm-timeout 30 --magic-rollback --auto-rollback"
+ "sudo -u test /nix/store/blah/etc/activate-rs '/blah/profiles/test' '/nix/store/blah/etc' --temp-path /tmp --confirm-timeout 30 --magic-rollback --auto-rollback --debug-logs --log-file /tmp/something.txt"
.to_string(),
);
}
@@ -107,6 +121,8 @@ pub async fn deploy_profile(
&temp_path,
confirm_timeout,
magic_rollback,
+ deploy_data.debug_logs,
+ deploy_data.log_dir,
);
debug!("Constructed activation command: {}", self_activate_command);