Skip to content

Commit 05c7284

Browse files
committed
don't hide hostname querying in verbose
1 parent cf897a8 commit 05c7284

File tree

3 files changed

+20
-10
lines changed

3 files changed

+20
-10
lines changed

src/bin/commands/containers.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ pub fn create_persistent_volume(
396396
if let Some(channel) = channel {
397397
toolchain.channel = channel.channel.clone();
398398
};
399-
let mount_finder = docker::MountFinder::create(engine)?;
399+
let mount_finder = docker::MountFinder::create(engine, msg_info)?;
400400
let dirs = docker::ToolchainDirectories::assemble(&mount_finder, toolchain.clone())?;
401401
let container_id = dirs.unique_container_identifier(&toolchain.host().target)?;
402402
let volume_id = dirs.unique_toolchain_identifier()?;
@@ -464,7 +464,7 @@ pub fn remove_persistent_volume(
464464
if let Some(channel) = channel {
465465
toolchain.channel = channel.channel.clone();
466466
};
467-
let mount_finder = docker::MountFinder::create(engine)?;
467+
let mount_finder = docker::MountFinder::create(engine, msg_info)?;
468468
let dirs = docker::ToolchainDirectories::assemble(&mount_finder, toolchain)?;
469469
let volume_id = dirs.unique_toolchain_identifier()?;
470470
let volume = docker::DockerVolume::new(engine, &volume_id);

src/docker/shared.rs

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,9 @@ impl DockerPaths {
200200
metadata: CargoMetadata,
201201
cwd: PathBuf,
202202
toolchain: QualifiedToolchain,
203+
msg_info: &mut MessageInfo,
203204
) -> Result<Self> {
204-
let mount_finder = MountFinder::create(engine)?;
205+
let mount_finder = MountFinder::create(engine, msg_info)?;
205206
let (directories, metadata) =
206207
Directories::assemble(&mount_finder, metadata, &cwd, toolchain)?;
207208
Ok(Self {
@@ -1325,7 +1326,10 @@ pub(crate) fn get_image(config: &Config, target: &Target, uses_zig: bool) -> Res
13251326
Ok(image)
13261327
}
13271328

1328-
fn docker_read_mount_paths(engine: &Engine) -> Result<Vec<MountDetail>> {
1329+
fn docker_read_mount_paths(
1330+
engine: &Engine,
1331+
msg_info: &mut MessageInfo,
1332+
) -> Result<Vec<MountDetail>> {
13291333
let hostname = env::var("HOSTNAME").wrap_err("HOSTNAME environment variable not found")?;
13301334

13311335
let mut docker: Command = {
@@ -1334,7 +1338,7 @@ fn docker_read_mount_paths(engine: &Engine) -> Result<Vec<MountDetail>> {
13341338
command
13351339
};
13361340

1337-
let output = docker.run_and_get_stdout(&mut Verbosity::Quiet.into())?;
1341+
let output = docker.run_and_get_stdout(msg_info)?;
13381342
let info = serde_json::from_str(&output).wrap_err("failed to parse docker inspect output")?;
13391343
dockerinfo_parse_mounts(&info)
13401344
}
@@ -1410,9 +1414,9 @@ impl MountFinder {
14101414
MountFinder { mounts }
14111415
}
14121416

1413-
pub fn create(engine: &Engine) -> Result<MountFinder> {
1417+
pub fn create(engine: &Engine, msg_info: &mut MessageInfo) -> Result<MountFinder> {
14141418
Ok(if engine.in_docker {
1415-
MountFinder::new(docker_read_mount_paths(engine)?)
1419+
MountFinder::new(docker_read_mount_paths(engine, msg_info)?)
14161420
} else {
14171421
MountFinder::default()
14181422
})
@@ -1695,12 +1699,12 @@ mod tests {
16951699
return Ok(());
16961700
}
16971701

1698-
let mount_finder = MountFinder::create(&engine)?;
1702+
let mount_finder = MountFinder::create(&engine, &mut msg_info)?;
16991703
let metadata = cargo_metadata(true, &mut msg_info)?;
17001704
let (directories, _) = get_directories(metadata, &mount_finder)?;
17011705
let toolchain_dirs = directories.toolchain_directories();
17021706
let package_dirs = directories.package_directories();
1703-
let mount_finder = MountFinder::new(docker_read_mount_paths(&engine)?);
1707+
let mount_finder = MountFinder::new(docker_read_mount_paths(&engine, &mut msg_info)?);
17041708
let mount_path = |p| mount_finder.find_mount_path(p);
17051709

17061710
paths_equal(toolchain_dirs.cargo(), &mount_path(home()?.join(".cargo")))?;

src/lib.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,13 @@ To override the toolchain mounted in the image, set `target.{}.image.toolchain =
707707
engine.register_binfmt(&target, msg_info)?;
708708
}
709709

710-
let paths = docker::DockerPaths::create(&engine, metadata, cwd, toolchain.clone())?;
710+
let paths = docker::DockerPaths::create(
711+
&engine,
712+
metadata,
713+
cwd,
714+
toolchain.clone(),
715+
msg_info,
716+
)?;
711717
let options = docker::DockerOptions::new(
712718
engine,
713719
target.clone(),

0 commit comments

Comments
 (0)