Skip to content

Commit c0834cc

Browse files
committed
refactor code
1 parent 6360c52 commit c0834cc

File tree

2 files changed

+16
-31
lines changed

2 files changed

+16
-31
lines changed

dsc_lib/src/dscresources/command_resource.rs

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -826,46 +826,26 @@ pub fn log_stderr_line<'a>(process_id: &u32, trace_line: &'a str) -> &'a str
826826
include_target = false;
827827
0
828828
};
829+
let trace_message = if include_target {
830+
format!("Process {process_id}: {target}: {line_number}: {}", trace_object.fields.message)
831+
} else {
832+
format!("Process {process_id}: {}", trace_object.fields.message)
833+
};
829834
match trace_object.level {
830835
TraceLevel::Error => {
831-
if include_target {
832-
error!("Process {process_id}: {target}: {line_number}: {}", trace_object.fields.message);
833-
}
834-
else {
835-
error!("Process {process_id}: {}", trace_object.fields.message);
836-
}
836+
error!(trace_message);
837837
},
838838
TraceLevel::Warning => {
839-
if include_target {
840-
warn!("Process {process_id}: {target}: {line_number}: {}", trace_object.fields.message);
841-
}
842-
else {
843-
warn!("Process {process_id}: {}", trace_object.fields.message);
844-
}
839+
warn!(trace_message);
845840
},
846841
TraceLevel::Info => {
847-
if include_target {
848-
info!("Process {process_id}: {target}: {line_number}: {}", trace_object.fields.message);
849-
}
850-
else {
851-
info!("Process {process_id}: {}", trace_object.fields.message);
852-
}
842+
info!(trace_message);
853843
},
854844
TraceLevel::Debug => {
855-
if include_target {
856-
debug!("Process {process_id}: {target}: {line_number}: {}", trace_object.fields.message);
857-
}
858-
else {
859-
debug!("Process {process_id}: {}", trace_object.fields.message);
860-
}
845+
debug!(trace_message);
861846
},
862847
TraceLevel::Trace => {
863-
if include_target {
864-
trace!("Process {process_id}: {target}: {line_number}: {}", trace_object.fields.message);
865-
}
866-
else {
867-
trace!("Process {process_id}: {}", trace_object.fields.message);
868-
}
848+
trace!(trace_message);
869849
},
870850
}
871851
}

tree-sitter-dscexpression/build.ps1

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,12 @@ if ($null -eq (Get-Command npm -ErrorAction Ignore)) {
2929
}
3030
}
3131

32-
npm ci --omit:optional --force --registry https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/npm/registry/
32+
if ($null -ne $env:TF_BUILD) {
33+
npm ci --omit:optional --registry https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/npm/registry/
34+
}
35+
else {
36+
npm install --omit:optional --registry https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/npm/registry/
37+
}
3338

3439
#npm list tree-sitter-cli
3540
#if ($LASTEXITCODE -ne 0) {

0 commit comments

Comments
 (0)