picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
Systemd/src
History
bl33pbl0p 28d78d0726 Log the job being merged 
Makes it easier to understand what was merged (and easier to realize why).

Example is a start job running, and another unit triggering a verify-active job. It is not clear what job was it that from baz.service that merged into the installed job for bar.service in the debug logs. This makes it useful when debugging issues.

Jan 15 11:45:58 jupiter systemd[1218]: baz.service: Trying to enqueue job baz.service/start/replace
Jan 15 11:45:58 jupiter systemd[1218]: baz.service: Installed new job baz.service/start as 498
Jan 15 11:45:58 jupiter systemd[1218]: bar.service: Merged into installed job bar.service/start as 497
Jan 15 11:45:58 jupiter systemd[1218]: baz.service: Enqueued job baz.service/start as 498

It becomes:
Jan 15 11:45:58 jupiter systemd[1218]: bar.service: Merged bar.service/verify-active into installed job bar.service/start as 497
2019-01-16 12:34:54 +01:00
..
ac-power coccinelle: make use of SYNTHETIC_ERRNO 2018-11-22 10:54:38 +01:00
activate tree-wide: use FORK_RLIMIT_NOFILE_SAFE wherever possible 2018-12-01 12:50:45 +01:00
analyze Delete duplicate lines 2019-01-12 16:02:26 +01:00
ask-password coccinelle: make use of SYNTHETIC_ERRNO 2018-11-22 10:54:38 +01:00
backlight tree-wide: port various places over to STARTSWITH_SET() 2018-11-26 14:08:46 +01:00
basic Merge pull request #11345 from kirbyfan64/tmpfiles-c-empty 2019-01-15 16:54:19 +01:00
binfmt coccinelle: make use of SYNTHETIC_ERRNO 2018-11-22 10:54:38 +01:00
boot Remove 'inline' attributes from static functions in .c files (#11426) 2019-01-15 08:12:28 +01:00
busctl locale-util: prefix special glyph enum values with SPECIAL_GLYPH_ 2018-12-14 08:22:54 +01:00
cgls coccinelle: make use of SYNTHETIC_ERRNO 2018-11-22 10:54:38 +01:00
cgroups-agent log: introduce new helper call log_setup_service() 2018-11-20 11:18:22 +01:00
cgtop cgroup: s/cgroups? ?v?([0-9])/cgroup v\1/gI 2019-01-03 11:32:40 +09:00
core Log the job being merged 2019-01-16 12:34:54 +01:00
coredump Remove 'inline' attributes from static functions in .c files (#11426) 2019-01-15 08:12:28 +01:00
cryptsetup generators: define custom main func definer and use it where applicable 2018-12-12 21:58:00 +01:00
debug-generator generators: define custom main func definer and use it where applicable 2018-12-12 21:58:00 +01:00
delta locale-util: prefix special glyph enum values with SPECIAL_GLYPH_ 2018-12-14 08:22:54 +01:00
detect-virt coccinelle: make use of SYNTHETIC_ERRNO 2018-11-22 10:54:38 +01:00
dissect coccinelle: make use of SYNTHETIC_ERRNO 2018-11-22 10:54:38 +01:00
environment-d-generator util-lib: split out env file parsing code into env-file.c 2018-12-02 13:22:29 +01:00
escape coccinelle: make use of SYNTHETIC_ERRNO 2018-11-22 10:54:38 +01:00
firstboot locale-util: prefix special glyph enum values with SPECIAL_GLYPH_ 2018-12-14 08:22:54 +01:00
fsck fsck: use symbolic names where we have them 2019-01-07 17:50:39 +01:00
fstab-generator fstab-generator: remove spurious newline 2018-12-15 12:06:44 +01:00
fuzz udev: use typedef for struct udev_rules 2018-12-17 09:27:21 +01:00
getty-generator getty-generator: use the new main function definer 2018-12-12 21:58:00 +01:00
gpt-auto-generator Merge pull request #10912 from poettering/gpt-root-rw 2018-12-20 11:37:41 +01:00
hibernate-resume coccinelle: make use of SYNTHETIC_ERRNO 2018-11-22 10:54:38 +01:00
hostname Merge pull request #11086 from poettering/nscd-cache-flush 2018-12-17 11:29:58 +01:00
hwdb Split out pretty-print.c and move pager.c and main-func.h to shared/ 2018-11-20 18:40:02 +01:00
id128 coccinelle: also mark previous synthetic errnos as such 2018-11-22 10:54:38 +01:00
import meson: generate version tag from git 2018-12-21 13:43:20 +01:00
initctl coccinelle: make use of SYNTHETIC_ERRNO 2018-11-22 10:54:38 +01:00
journal Remove 'inline' attributes from static functions in .c files (#11426) 2019-01-15 08:12:28 +01:00
journal-remote Remove 'inline' attributes from static functions in .c files (#11426) 2019-01-15 08:12:28 +01:00
kernel-install Improve kernel-install support for initrd files. (#11281) 2018-12-30 04:01:10 +09:00
libsystemd Merge pull request #11418 from yuwata/fix-11404 2019-01-15 21:04:32 +01:00
libsystemd-network Delete duplicate lines 2019-01-12 16:02:26 +01:00
libudev Remove 'inline' attributes from static functions in .c files (#11426) 2019-01-15 08:12:28 +01:00
locale Merge pull request #11041 from yuwata/update-missing-v2 2018-12-04 16:19:02 +01:00
login Revert "logind: become the controlling terminal process before restoring VT" 2019-01-10 15:59:13 +01:00
machine timesyncd,resolved,machinectl: drop calls to sd_event_get_exit_code() 2019-01-08 23:26:07 +01:00
machine-id-setup coccinelle: make use of SYNTHETIC_ERRNO 2018-11-22 10:54:38 +01:00
modules-load modules-load: use static destructor and DEFINE_MAIN_FUNCTION() macro 2018-11-20 18:40:02 +01:00
mount Split out part of mount-util.c into mountpoint-util.c 2018-11-29 21:03:44 +01:00
network Merge pull request #11418 from yuwata/fix-11404 2019-01-15 21:04:32 +01:00
notify coccinelle: make use of SYNTHETIC_ERRNO 2018-11-22 10:54:38 +01:00
nspawn tree-wide: Remove O_CLOEXEC from fdopen 2018-12-12 20:47:40 +01:00
nss-myhostname Revert "nss: prevent PROTECT_ERRNO from squashing changes to *errnop" 2019-01-10 21:23:14 +01:00
nss-mymachines Revert "nss: prevent PROTECT_ERRNO from squashing changes to *errnop" 2019-01-10 21:23:14 +01:00
nss-resolve Revert "nss: prevent PROTECT_ERRNO from squashing changes to *errnop" 2019-01-10 21:23:14 +01:00
nss-systemd Revert "nss: prevent PROTECT_ERRNO from squashing changes to *errnop" 2019-01-10 21:23:14 +01:00
partition makefs: correct child process name 2018-12-01 12:50:45 +01:00
path coccinelle: make use of SYNTHETIC_ERRNO 2018-11-22 10:54:38 +01:00
portable locale-util: prefix special glyph enum values with SPECIAL_GLYPH_ 2018-12-14 08:22:54 +01:00
quotacheck tree-wide: use FORK_RLIMIT_NOFILE_SAFE wherever possible 2018-12-01 12:50:45 +01:00
random-seed coccinelle: make use of SYNTHETIC_ERRNO 2018-11-22 10:54:38 +01:00
rc-local-generator generators: define custom main func definer and use it where applicable 2018-12-12 21:58:00 +01:00
remount-fs remount-fs: optionally remount / writable, if we are told through an env var 2018-12-18 14:47:44 +01:00
reply-password log: introduce new helper call log_setup_service() 2018-11-20 11:18:22 +01:00
resolve Remove 'inline' attributes from static functions in .c files (#11426) 2019-01-15 08:12:28 +01:00
rfkill rfkill: move wait_for_initialized() to shared/ 2018-12-17 13:50:51 +01:00
run tree-wide: port various places over to STARTSWITH_SET() 2018-11-26 14:08:46 +01:00
run-generator generators: define custom main func definer and use it where applicable 2018-12-12 21:58:00 +01:00
shared Remove 'inline' attributes from static functions in .c files (#11426) 2019-01-15 08:12:28 +01:00
sleep sleep: install default sleep.conf 2019-01-03 14:43:15 +01:00
socket-proxy tree-wide: use c99 static for array size declarations 2019-01-04 12:37:25 +01:00
stdio-bridge coccinelle: make use of SYNTHETIC_ERRNO 2018-11-22 10:54:38 +01:00
sulogin-shell tree-wide: use FORK_RLIMIT_NOFILE_SAFE wherever possible 2018-12-01 12:50:45 +01:00
sysctl sysctl: Don't pass null directive argument to '%s' 2018-12-16 21:01:39 -08:00
system-update-generator system-update-generator: use the new main function definer 2018-12-12 21:58:00 +01:00
systemctl Merge pull request #11197 from keszybz/various-fixups 2018-12-18 14:35:00 +01:00
systemd Delete duplicate lines 2019-01-12 16:02:26 +01:00
sysusers Merge pull request #10920 from yuwata/hashmap-destructor 2018-12-03 17:59:44 +01:00
sysv-generator generators: define custom main func definer and use it where applicable 2018-12-12 21:58:00 +01:00
test Delete duplicate lines 2019-01-12 16:02:26 +01:00
time-wait-sync time-wait: define main through macro 2018-11-23 06:22:30 +09:00
timedate timedated: Add dbus method to retrieve list of time zones (#11114) 2018-12-12 20:49:04 +01:00
timesync timesyncd,resolved,machinectl: drop calls to sd_event_get_exit_code() 2019-01-08 23:26:07 +01:00
tmpfiles tmpfiles: Make C still copy if the destination directory is empty 2019-01-08 14:30:15 -06:00
tty-ask-password-agent coccinelle: make use of SYNTHETIC_ERRNO 2018-11-22 10:54:38 +01:00
udev udev: do logging before setting variables to NULL 2019-01-15 13:58:45 +01:00
update-done update-done: quit earlier on failure 2018-11-23 06:22:30 +09:00
update-utmp update-utmp: use _cleanup_ attribute to finalize process 2018-11-23 06:22:30 +09:00
user-sessions tree-wide: add whitespace between type and variable name 2018-12-04 09:29:54 +01:00
vconsole vconsole-setup: fonts copy will fail if the current terminal is in graphical mode 2018-12-13 08:30:20 +01:00
veritysetup generators: define custom main func definer and use it where applicable 2018-12-12 21:58:00 +01:00
volatile-root Split out part of mount-util.c into mountpoint-util.c 2018-11-29 21:03:44 +01:00