artemist/lix-installer
0
0
Fork 0
forked from lix-project/lix-installer
Code Pull requests Activity

Make calls to tracing logs explicit

Browse source
This commit is contained in:
Graham Christensen 2023-11-25 14:59:19 -05:00
parent b5a4d15fb8
commit 3da67105ca
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/cli/subcommand/export.rs
View file

@ -9,8 +9,6 @@ use std::process::ExitCode;
use crate::cli::CommandExecute;
use clap::Parser;
use tracing::{debug, warn};
const LOCAL_STATE_DIR: &str = "/nix/var";
#[derive(Debug, thiserror::Error)]
@ -70,7 +68,7 @@ impl CommandExecute for Export {
async fn execute(self) -> eyre::Result<ExitCode> {
let env = match calculate_environment() {
e @ Err(Error::AlreadyRun) => {
debug!("Ignored error: {:?}", e);
tracing::debug!("Ignored error: {:?}", e);
return Ok(ExitCode::SUCCESS);
},
Err(e) => {
@ -85,7 +83,7 @@ impl CommandExecute for Export {
match self.format {
ExportFormat::NullSeparated => {
debug!("Emitting null separated fields");
tracing::debug!("Emitting null separated fields");
for (key, value) in env.into_iter() {
out.write_all(key.as_bytes())?;
@ -95,7 +93,7 @@ impl CommandExecute for Export {
}
},
ExportFormat::SpaceNewlineSeparated => {
debug!("Emitting space/newline separated fields");
tracing::debug!("Emitting space/newline separated fields");
let mut validated_envs = HashMap::new();
for (key, value) in env.into_iter() {
@ -103,17 +101,17 @@ impl CommandExecute for Export {
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_"
.contains(char)
}) {
warn!("Key {} has an invalid character that isn't a-zA-Z0-9_", key);
tracing::warn!(
"Key {} has an invalid character that isn't a-zA-Z0-9_",
key
);
return Ok(ExitCode::FAILURE);
}
let value_bytes = value.into_vec();
if value_bytes.contains(&b'\n') {
warn!(
"Value for key {} has a newline, which is prohibited",
key
);
tracing::warn!("Value for key {} has a newline, which is prohibited", key);
return Ok(ExitCode::FAILURE);
}
@ -239,7 +237,7 @@ pub fn calculate_environment() -> Result<HashMap<&'static str, OsString>, Error>
if let Some(cert) = candidate_locations.iter().find(|path| path.is_file()) {
envs.insert("NIX_SSL_CERT_FILE", cert.into());
} else {
warn!(
tracing::warn!(
"Could not identify any SSL certificates out of these candidates: {:?}",
candidate_locations
)
@ -282,7 +280,7 @@ pub fn calculate_environment() -> Result<HashMap<&'static str, OsString>, Error>
}
}
debug!("Calculated environment: {:#?}", envs);
tracing::debug!("Calculated environment: {:#?}", envs);
Ok(envs)
}