shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-26 17:25:34 +03:00
Code

udev: stop to use LOG_REALM_UDEV

Browse Source 
Before this commit, udevd is built with LOG_REALM=LOG_REALM_UDEV.
However, log level specified by e.g. environment variable or kernel
command line option are also passed to LOG_REALM_SYSTEMD. So, the
maximum log level for the two realms are always equivalent, and it is
not necessary to specify the build option. Hence drop it.
This commit is contained in:
Yu Watanabe 2021-01-17 13:32:29 +09:00
parent 10d296c189
commit 3cc6b14a87
8 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meson.build
View File

@ -3161,7 +3161,6 @@ public_programs += executable(
public_programs += executable(
'udevadm',
udevadm_sources,
c_args : '-DLOG_REALM=LOG_REALM_UDEV',
include_directories : includes,
link_with : [libudevd_core],
dependencies : [versiondep,

2
src/shared/udev-util.c
View File

@ -68,7 +68,7 @@ int udev_parse_config_full(
/* we set the udev log level here explicitly, this is supposed
* to regulate the code in libudev/ and udev/. */
r = log_set_max_level_from_string_realm(LOG_REALM_UDEV, log);
r = log_set_max_level_from_string(log);
if (r < 0)
log_syntax(NULL, LOG_WARNING, "/etc/udev/udev.conf", 0, r,
"failed to set udev log level '%s', ignoring: %m", log);

2
src/test/meson.build
View File

@ -527,7 +527,7 @@ tests += [
libkmod,
libacl,
libselinux],
udev_includes, '', 'manual', '-DLOG_REALM=LOG_REALM_UDEV'],
udev_includes, '', 'manual'],
[['src/test/test-udev-util.c']],

6
src/udev/fuzz-udev-rules.c
View File

@ -15,10 +15,8 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
_cleanup_(unlink_tempfilep) char filename[] = "/tmp/fuzz-udev-rules.XXXXXX";
int r;
if (!getenv("SYSTEMD_LOG_LEVEL")) {
log_set_max_level_realm(LOG_REALM_UDEV, LOG_CRIT);
log_set_max_level_realm(LOG_REALM_SYSTEMD, LOG_CRIT);
}
if (!getenv("SYSTEMD_LOG_LEVEL"))
log_set_max_level(LOG_CRIT);
assert_se(fmkostemp_safe(filename, "r+", &f) == 0);
if (size != 0)

2
src/udev/meson.build
View File

@ -112,7 +112,6 @@ libudevd_core = static_library(
link_config_gperf_c,
keyboard_keys_from_name_h,
include_directories : udev_includes,
c_args : ['-DLOG_REALM=LOG_REALM_UDEV'],
link_with : udev_link_with,
dependencies : [libblkid, libkmod])
@ -142,7 +141,6 @@ foreach prog : udev_id_progs
name,
prog,
include_directories : includes,
c_args : ['-DLOG_REALM=LOG_REALM_UDEV'],
dependencies : [versiondep],
link_with : udev_link_with,
install_rpath : udev_rpath,

2
src/udev/udev-rules.c
View File

@ -1868,7 +1868,7 @@ static int udev_rule_apply_token_to_event(
if (level < 0)
level = event->default_log_level;
log_set_max_level_all_realms(level);
log_set_max_level(level);
if (level == LOG_DEBUG && !event->log_level_was_debug) {
/* The log level becomes LOG_DEBUG at first time. Let's log basic information. */

2
src/udev/udevadm.c
View File

@ -122,8 +122,6 @@ static int run(int argc, char *argv[]) {
if (r <= 0)
return r;
log_set_max_level_realm(LOG_REALM_SYSTEMD, log_get_max_level());
r = mac_selinux_init();
if (r < 0)
return r;

6
src/udev/udevd.c
View File

@ -537,7 +537,7 @@ static int worker_device_monitor_handler(sd_device_monitor *monitor, sd_device *
log_device_warning_errno(dev, r, "Failed to send signal to main daemon, ignoring: %m");
/* Reset the log level, as it might be changed by "OPTIONS=log_level=". */
log_set_max_level_all_realms(manager->log_level);
log_set_max_level(manager->log_level);
return 1;
}
@ -1062,7 +1062,7 @@ static int on_ctrl_msg(struct udev_ctrl *uctrl, enum udev_ctrl_msg_type type, co
switch (type) {
case UDEV_CTRL_SET_LOG_LEVEL:
log_debug("Received udev control message (SET_LOG_LEVEL), setting log_level=%i", value->intval);
log_set_max_level_all_realms(value->intval);
log_set_max_level(value->intval);
manager->log_level = value->intval;
manager_kill_workers(manager);
break;
@ -1852,8 +1852,6 @@ int run_udevd(int argc, char *argv[]) {
log_set_max_level(LOG_DEBUG);
}
log_set_max_level_realm(LOG_REALM_SYSTEMD, log_get_max_level());
r = must_be_root();
if (r < 0)
return r;