Skip to content

Commit ea6fd5d

Browse files
authored
chore: update log related to dfx generate (#4004)
* trace log when generating type instead of eprintln * debug log when frontend build succeed instead of warning * fmt
1 parent c497d76 commit ea6fd5d

File tree

4 files changed

+23
-10
lines changed

4 files changed

+23
-10
lines changed

src/dfx/src/commands/generate.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ pub fn exec(env: &dyn Environment, opts: GenerateOpts) -> DfxResult {
7777
}
7878

7979
for canister in canister_pool_load.canisters_to_build(&generate_config) {
80-
canister.generate(&canister_pool_load, &generate_config)?;
80+
canister.generate(log, &canister_pool_load, &generate_config)?;
8181
}
8282

8383
Ok(())

src/dfx/src/lib/builders/assets.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,11 @@ fn build_frontend(
239239
)));
240240
} else if !output.stderr.is_empty() {
241241
// Cannot use eprintln, because it would interfere with the progress bar.
242-
slog::warn!(logger, "{}", String::from_utf8_lossy(&output.stderr));
242+
slog::debug!(
243+
logger,
244+
"Frontend build succeed:\n{}",
245+
String::from_utf8_lossy(&output.stderr)
246+
);
243247
}
244248
}
245249
Ok(())

src/dfx/src/lib/builders/mod.rs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ use dfx_core::network::provider::get_network_context;
1212
use dfx_core::util;
1313
use fn_error_context::context;
1414
use handlebars::Handlebars;
15+
use slog::{trace, Logger};
1516
use std::borrow::Cow;
1617
use std::collections::BTreeMap;
1718
use std::ffi::OsStr;
@@ -94,6 +95,7 @@ pub trait CanisterBuilder {
9495
/// Generate type declarations for the canister
9596
fn generate(
9697
&self,
98+
logger: &Logger,
9799
pool: &CanisterPool,
98100
info: &CanisterInfo,
99101
config: &BuildConfig,
@@ -137,8 +139,9 @@ pub trait CanisterBuilder {
137139
return Ok(());
138140
}
139141

140-
eprintln!(
141-
"Generating type declarations for canister {}:",
142+
trace!(
143+
logger,
144+
"Generating type declarations for canister {}",
142145
&info.get_name()
143146
);
144147

@@ -172,7 +175,7 @@ pub trait CanisterBuilder {
172175
output_did_ts_path.to_string_lossy()
173176
)
174177
})?;
175-
eprintln!(" {}", &output_did_ts_path.display());
178+
trace!(logger, " {}", &output_did_ts_path.display());
176179

177180
compile_handlebars_files("ts", info, generate_output_dir)?;
178181
}
@@ -191,7 +194,7 @@ pub trait CanisterBuilder {
191194
output_did_js_path.to_string_lossy()
192195
)
193196
})?;
194-
eprintln!(" {}", &output_did_js_path.display());
197+
trace!(logger, " {}", &output_did_js_path.display());
195198

196199
compile_handlebars_files("js", info, generate_output_dir)?;
197200
}
@@ -206,7 +209,7 @@ pub trait CanisterBuilder {
206209
std::fs::write(&output_mo_path, content).with_context(|| {
207210
format!("Failed to write to {}.", output_mo_path.to_string_lossy())
208211
})?;
209-
eprintln!(" {}", &output_mo_path.display());
212+
trace!(logger, " {}", &output_mo_path.display());
210213
}
211214

212215
// Candid
@@ -216,7 +219,7 @@ pub trait CanisterBuilder {
216219
.with_extension("did");
217220
dfx_core::fs::copy(&did_from_build, &output_did_path)?;
218221
dfx_core::fs::set_permissions_readwrite(&output_did_path)?;
219-
eprintln!(" {}", &output_did_path.display());
222+
trace!(logger, " {}", &output_did_path.display());
220223
}
221224

222225
Ok(())

src/dfx/src/lib/models/canister.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,14 @@ impl Canister {
104104
}
105105

106106
#[context("Failed while trying to generate type declarations for '{}'.", self.info.get_name())]
107-
pub fn generate(&self, pool: &CanisterPool, build_config: &BuildConfig) -> DfxResult {
108-
self.builder.generate(pool, &self.info, build_config)
107+
pub fn generate(
108+
&self,
109+
logger: &Logger,
110+
pool: &CanisterPool,
111+
build_config: &BuildConfig,
112+
) -> DfxResult {
113+
self.builder
114+
.generate(logger, pool, &self.info, build_config)
109115
}
110116

111117
#[context("Failed to post-process wasm of canister '{}'.", self.info.get_name())]

0 commit comments

Comments
 (0)