diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-01-21 14:06:43 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-02-01 23:37:27 +0900 |
| commit | 90d260d81f56adb831f51acfc086fcd0a7fb8712 (patch) | |
| tree | 01124efb6f3be6ce2c3cd740e913801547edd346 | |
| parent | 77591e97327d6fc47f27599ba1937629afb6dd13 (diff) | |
| download | systemd-90d260d81f56adb831f51acfc086fcd0a7fb8712.tar.gz | |
udev: add debugging logs in spawn_wait()
| -rw-r--r-- | src/udev/udev-event.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c index 9fb5e4ae62..009a48020e 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c @@ -661,7 +661,7 @@ static int spawn_wait(Spawn *spawn) { r = sd_event_new(&e); if (r < 0) - return r; + return log_device_debug_errno(spawn->device, r, "Failed to allocate sd-event object: %m"); if (spawn->timeout_usec > 0) { usec_t usec, age_usec; @@ -678,7 +678,7 @@ static int spawn_wait(Spawn *spawn) { usec + spawn->timeout_warn_usec, USEC_PER_SEC, on_spawn_timeout_warning, spawn); if (r < 0) - return r; + return log_device_debug_errno(spawn->device, r, "Failed to create timeout warning event source: %m"); } spawn->timeout_usec -= age_usec; @@ -686,35 +686,35 @@ static int spawn_wait(Spawn *spawn) { r = sd_event_add_time(e, NULL, CLOCK_MONOTONIC, usec + spawn->timeout_usec, USEC_PER_SEC, on_spawn_timeout, spawn); if (r < 0) - return r; + return log_device_debug_errno(spawn->device, r, "Failed to create timeout event source: %m"); } } if (spawn->fd_stdout >= 0) { r = sd_event_add_io(e, &stdout_source, spawn->fd_stdout, EPOLLIN, on_spawn_io, spawn); if (r < 0) - return r; + return log_device_debug_errno(spawn->device, r, "Failed to create stdio event source: %m"); r = sd_event_source_set_enabled(stdout_source, SD_EVENT_ONESHOT); if (r < 0) - return r; + return log_device_debug_errno(spawn->device, r, "Failed to enable stdio event source: %m"); } if (spawn->fd_stderr >= 0) { r = sd_event_add_io(e, &stderr_source, spawn->fd_stderr, EPOLLIN, on_spawn_io, spawn); if (r < 0) - return r; + return log_device_debug_errno(spawn->device, r, "Failed to create stderr event source: %m"); r = sd_event_source_set_enabled(stderr_source, SD_EVENT_ONESHOT); if (r < 0) - return r; + return log_device_debug_errno(spawn->device, r, "Failed to enable stderr event source: %m"); } r = sd_event_add_child(e, &sigchld_source, spawn->pid, WEXITED, on_spawn_sigchld, spawn); if (r < 0) - return r; + return log_device_debug_errno(spawn->device, r, "Failed to create sigchild event source: %m"); /* SIGCHLD should be processed after IO is complete */ r = sd_event_source_set_priority(sigchld_source, SD_EVENT_PRIORITY_NORMAL + 1); if (r < 0) - return r; + return log_device_debug_errno(spawn->device, r, "Failed to set priority to sigchild event source: %m"); return sd_event_loop(e); } |