X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fmanager.c;h=45f5f70b2acd8caed560f786ce89473903996a5c;hp=5f50fee825e5b7f09e93b692b7e8c40ecc889349;hb=75cb8502dfec0a6a5305fe766d4b6a1a04a43549;hpb=e5723c894db1ead8a10ffb1800e53e9064656d7e diff --git a/src/core/manager.c b/src/core/manager.c index 5f50fee82..45f5f70b2 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -105,7 +105,6 @@ static int manager_watch_jobs_in_progress(Manager *m) { return 0; next = now(CLOCK_MONOTONIC) + JOBS_IN_PROGRESS_WAIT_USEC; - log_debug("queuing for "USEC_FMT, next); return sd_event_add_monotonic(m->event, next, 0, manager_dispatch_jobs_in_progress, m, &m->jobs_in_progress_event_source); } @@ -190,7 +189,7 @@ static void manager_print_jobs_in_progress(Manager *m) { if (job_get_timeout(j, &x) > 0) format_timespan(limit, sizeof(limit), x - j->begin_usec, 1*USEC_PER_SEC); - manager_status_printf(m, false, cylon, + manager_status_printf(m, true, cylon, "%sA %s job is running for %s (%s / %s)", strempty(job_of_n), job_type_to_string(j->type), @@ -599,7 +598,7 @@ static int manager_setup_kdbus(Manager *m) { * necessary to ensure that users cannot get access to busses * of virtualized users when no UID namespacing is used. */ if (m->running_as == SYSTEMD_SYSTEM) - mkdir_p_label("/dev/kdbus/ns", 0700); + mkdir_p_label("/dev/kdbus/domain", 0700); #endif return 0; @@ -1766,7 +1765,6 @@ static int manager_dispatch_jobs_in_progress(sd_event_source *source, usec_t use manager_print_jobs_in_progress(m); next = now(CLOCK_MONOTONIC) + JOBS_IN_PROGRESS_PERIOD_USEC; - log_debug("requeuing for "USEC_FMT, next); r = sd_event_source_set_time(source, next); if (r < 0) return r; @@ -2468,7 +2466,6 @@ void manager_check_finished(Manager *m) { if (hashmap_size(m->jobs) > 0) { if (m->jobs_in_progress_event_source) { uint64_t next = now(CLOCK_MONOTONIC) + JOBS_IN_PROGRESS_WAIT_USEC; - log_debug("requeuing for "USEC_FMT, next); sd_event_source_set_time(m->jobs_in_progress_event_source, next); } return;