Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump log from 0.4.21 to 0.4.22 #1158

Merged
merged 2 commits into from
Jul 9, 2024
Merged

Bump log from 0.4.21 to 0.4.22 #1158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
149c293
Bump log from 0.4.21 to 0.4.22
dependabot[bot] Jul 9, 2024
71a063c
Fix clippy
flxoacn Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion northstar-runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ inotify = { version = "0.10.2", features = ["stream"], optional = true }
itertools = { version = "0.12.1", optional = true }
lazy_static = { version = "1.4.0", optional = true }
libc = { version = "0.2.155", optional = true }
log = { version = "0.4.21", features = [ "serde", "max_level_trace", "release_max_level_debug"] }
log = { version = "0.4.22", features = [ "serde", "max_level_trace", "release_max_level_debug"] }
memchr = "2.6.2"
memfd = { version = "0.6.4", optional = true }
memoffset = { version = "0.9.0", optional = true }
Expand Down
39 changes: 15 additions & 24 deletions northstar-runtime/src/runtime/fork/init/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use crate::{
seccomp,
};
use itertools::Itertools;
use log::warn;
use log::{debug, warn};
use nix::mount::MsFlags;
use std::{
ffi::{c_void, CString},
Expand Down Expand Up @@ -157,7 +157,7 @@ async fn prepare_mounts<'a, I: Iterator<Item = &'a Container> + Clone>(
}

fn proc(root: &Path, target: &Path) -> Mount {
log::debug!(
debug!(
"Adding proc on {} with options ro, nosuid, noexec and nodev",
target.display()
);
Expand All @@ -169,7 +169,7 @@ fn proc(root: &Path, target: &Path) -> Mount {
}

fn sysfs(root: &Path, target: &Path) -> Mount {
log::debug!(
debug!(
"Adding sysfs on {} with options ro, nosuid, noexec and nodev",
target.display()
);
Expand All @@ -181,7 +181,7 @@ fn sysfs(root: &Path, target: &Path) -> Mount {
}

fn sockets(socket_dir: &Path, root: &Path, target: &Path) -> Mount {
log::debug!("Adding sockets on {}", target.display());
debug!("Adding sockets on {}", target.display());
let target = root.join_strip(target);
Mount::new(
Some(socket_dir.to_owned()),
Expand All @@ -196,21 +196,12 @@ fn bind(root: &Path, target: &Path, host: &Path, options: &mount::MountOptions)
if host.exists() {
let rw = options.contains(&mount::MountOption::Rw);
let mut mounts = Vec::with_capacity(if rw { 2 } else { 1 });
if options.is_empty() {
log::debug!(
"Adding {} on {} with flags {}",
host.display(),
target.display(),
options
);
} else {
log::debug!(
"Adding {} on {} with flags {}",
host.display(),
target.display(),
options
);
}
debug!(
"Adding {} on {} with flags {}",
host.display(),
target.display(),
options
);
let source = host.to_owned();
let target = root.join_strip(target);
let mut flags = options_to_flags(options);
Expand All @@ -224,7 +215,7 @@ fn bind(root: &Path, target: &Path, host: &Path, options: &mount::MountOptions)
));

if !rw {
log::debug!(
debug!(
"Adding read only remount of {} on {}",
host.display(),
target.display()
Expand All @@ -235,7 +226,7 @@ fn bind(root: &Path, target: &Path, host: &Path, options: &mount::MountOptions)
}
mounts
} else {
log::debug!(
debug!(
"Skipping bind mount of nonexistent source {} to {}",
host.display(),
target.display()
Expand All @@ -254,7 +245,7 @@ async fn persist(
// upgrades with persistent data migration
let source = config.data_dir.join(manifest.name.as_ref());

log::debug!(
debug!(
"Adding {} on {} with options nodev, nosuid and noexec",
source.display(),
target.display(),
Expand Down Expand Up @@ -296,7 +287,7 @@ fn resource(
src
};

log::debug!(
debug!(
"Mounting {} on {} with {}",
src.display(),
target.display(),
Expand All @@ -315,7 +306,7 @@ fn resource(
}

fn tmpfs(root: &Path, target: &Path, size: u64) -> Mount {
log::debug!(
debug!(
"Mounting tmpfs with size {} on {}",
bytesize::ByteSize::b(size),
target.display()
Expand Down
2 changes: 1 addition & 1 deletion northstar-stress/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ clap = { version = "4.4.18", features = ["derive"] }
env_logger = "0.10.2"
futures = { version = "0.3.29", default-features = false }
humantime = "2.1.0"
log = "0.4.21"
log = "0.4.22"
northstar-client = { path = "../northstar-client" }
rand = "0.8.5"
tokio = { version = "1.32.0", features = ["rt-multi-thread", "macros", "net", "time", "signal"] }
Expand Down
2 changes: 1 addition & 1 deletion northstar-tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ anyhow = { version = "1.0.80", features = ["backtrace"] }
env_logger = "0.10.2"
futures = { version = "0.3.29", default-features = false }
lazy_static = "1.4.0"
log = "0.4.21"
log = "0.4.22"
memfd = "0.6.4"
nanoid = "0.4.0"
nix = { version = "0.29.0", features = ["sched"], default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion northstar/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ rust-version.workspace = true
[dependencies]
anyhow = { version = "1.0.80", features = ["backtrace"] }
clap = { version = "4.4.18", features = ["derive"] }
log = { version = "0.4.21", features = ["std"] }
log = { version = "0.4.22", features = ["std"] }
nix = { version = "0.29.0", default-features = false, features = ["sched", "mount"] }
northstar-runtime = { version = "^0.9.2-pre", path = "../northstar-runtime", features = ["runtime", "rexec"] }
tokio = { version = "1.32.0", features = ["rt-multi-thread", "macros", "signal"] }
Expand Down
Loading