X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Ftransaction.c;h=64c2af5a1c37373da92a6d1f877c9354ae328f8d;hp=6ad11b2fdb697d91a7d1810e27bfdd56c49386bf;hb=5bd4b173605142c7be493aa4d958ebaef21f421d;hpb=c21b92ffe7ef939dd32502ac912cf8ad1c5638fd diff --git a/src/core/transaction.c b/src/core/transaction.c index 6ad11b2fd..64c2af5a1 100644 --- a/src/core/transaction.c +++ b/src/core/transaction.c @@ -22,8 +22,7 @@ #include #include -#include "bus-errors.h" -#include "bus-util.h" +#include "bus-common-errors.h" #include "bus-error.h" #include "transaction.h" @@ -189,11 +188,11 @@ static int delete_one_unmergeable_job(Transaction *tr, Job *j) { * another unit in which case we * rather remove the start. */ - log_debug_unit(j->unit->id, + log_unit_debug(j->unit->id, "Looking at job %s/%s conflicted_by=%s", j->unit->id, job_type_to_string(j->type), yes_no(j->type == JOB_STOP && job_is_conflicted_by(j))); - log_debug_unit(k->unit->id, + log_unit_debug(k->unit->id, "Looking at job %s/%s conflicted_by=%s", k->unit->id, job_type_to_string(k->type), yes_no(k->type == JOB_STOP && job_is_conflicted_by(k))); @@ -222,7 +221,7 @@ static int delete_one_unmergeable_job(Transaction *tr, Job *j) { return -ENOEXEC; /* Ok, we can drop one, so let's do so. */ - log_debug_unit(d->unit->id, + log_unit_debug(d->unit->id, "Fixing conflicting jobs %s/%s,%s/%s by deleting job %s/%s", j->unit->id, job_type_to_string(j->type), k->unit->id, job_type_to_string(k->type), @@ -368,7 +367,7 @@ static int transaction_verify_order_one(Transaction *tr, Job *j, Job *from, unsi * job to remove. We use the marker to find our way * back, since smart how we are we stored our way back * in there. */ - log_warning_unit(j->unit->id, + log_unit_warning(j->unit->id, "Found ordering cycle on %s/%s", j->unit->id, job_type_to_string(j->type)); @@ -376,7 +375,7 @@ static int transaction_verify_order_one(Transaction *tr, Job *j, Job *from, unsi for (k = from; k; k = ((k->generation == generation && k->marker != k) ? k->marker : NULL)) { /* logging for j not k here here to provide consistent narrative */ - log_warning_unit(j->unit->id, + log_unit_warning(j->unit->id, "Found dependency on %s/%s", k->unit->id, job_type_to_string(k->type)); @@ -396,10 +395,10 @@ static int transaction_verify_order_one(Transaction *tr, Job *j, Job *from, unsi if (delete) { /* logging for j not k here here to provide consistent narrative */ - log_warning_unit(j->unit->id, + log_unit_warning(j->unit->id, "Breaking ordering cycle by deleting job %s/%s", delete->unit->id, job_type_to_string(delete->type)); - log_error_unit(delete->unit->id, + log_unit_error(delete->unit->id, "Job %s/%s deleted to break ordering cycle starting with %s/%s", delete->unit->id, job_type_to_string(delete->type), j->unit->id, job_type_to_string(j->type)); @@ -552,17 +551,17 @@ rescan: continue; if (stops_running_service) - log_debug_unit(j->unit->id, + log_unit_debug(j->unit->id, "%s/%s would stop a running service.", j->unit->id, job_type_to_string(j->type)); if (changes_existing_job) - log_debug_unit(j->unit->id, + log_unit_debug(j->unit->id, "%s/%s would change existing job.", j->unit->id, job_type_to_string(j->type)); /* Ok, let's get rid of this */ - log_debug_unit(j->unit->id, + log_unit_debug(j->unit->id, "Deleting %s/%s to minimize impact.", j->unit->id, job_type_to_string(j->type)); @@ -722,10 +721,8 @@ int transaction_activate(Transaction *tr, Manager *m, JobMode mode, sd_bus_error /* Tenth step: apply changes */ r = transaction_apply(tr, m, mode); - if (r < 0) { - log_warning("Failed to apply transaction: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_warning_errno(r, "Failed to apply transaction: %m"); assert(hashmap_isempty(tr->jobs)); @@ -819,7 +816,7 @@ static void transaction_unlink_job(Transaction *tr, Job *j, bool delete_dependen job_dependency_free(j->object_list); if (other && delete_dependencies) { - log_debug_unit(other->unit->id, + log_unit_debug(other->unit->id, "Deleting job %s/%s as dependency of job %s/%s", other->unit->id, job_type_to_string(other->type), j->unit->id, job_type_to_string(j->type)); @@ -915,7 +912,7 @@ int transaction_add_job_and_dependencies( SET_FOREACH(dep, following, i) { r = transaction_add_job_and_dependencies(tr, type, dep, ret, false, override, false, false, ignore_order, e); if (r < 0) { - log_warning_unit(dep->id, + log_unit_warning(dep->id, "Cannot add dependency job for unit %s, ignoring: %s", dep->id, bus_error_message(e, r)); @@ -954,7 +951,8 @@ int transaction_add_job_and_dependencies( SET_FOREACH(dep, ret->unit->dependencies[UNIT_REQUIRES_OVERRIDABLE], i) { r = transaction_add_job_and_dependencies(tr, JOB_START, dep, ret, !override, override, false, false, ignore_order, e); if (r < 0) { - log_full_unit(r == -EADDRNOTAVAIL ? LOG_DEBUG : LOG_WARNING, dep->id, + log_unit_full(dep->id, + r == -EADDRNOTAVAIL ? LOG_DEBUG : LOG_WARNING, "Cannot add dependency job for unit %s, ignoring: %s", dep->id, bus_error_message(e, r)); @@ -966,7 +964,8 @@ int transaction_add_job_and_dependencies( SET_FOREACH(dep, ret->unit->dependencies[UNIT_WANTS], i) { r = transaction_add_job_and_dependencies(tr, JOB_START, dep, ret, false, false, false, false, ignore_order, e); if (r < 0) { - log_full_unit(r == -EADDRNOTAVAIL ? LOG_DEBUG : LOG_WARNING, dep->id, + log_unit_full(dep->id, + r == -EADDRNOTAVAIL ? LOG_DEBUG : LOG_WARNING, "Cannot add dependency job for unit %s, ignoring: %s", dep->id, bus_error_message(e, r)); @@ -989,7 +988,8 @@ int transaction_add_job_and_dependencies( SET_FOREACH(dep, ret->unit->dependencies[UNIT_REQUISITE_OVERRIDABLE], i) { r = transaction_add_job_and_dependencies(tr, JOB_VERIFY_ACTIVE, dep, ret, !override, override, false, false, ignore_order, e); if (r < 0) { - log_full_unit(r == -EADDRNOTAVAIL ? LOG_DEBUG : LOG_WARNING, dep->id, + log_unit_full(dep->id, + r == -EADDRNOTAVAIL ? LOG_DEBUG : LOG_WARNING, "Cannot add dependency job for unit %s, ignoring: %s", dep->id, bus_error_message(e, r)); @@ -1012,7 +1012,7 @@ int transaction_add_job_and_dependencies( SET_FOREACH(dep, ret->unit->dependencies[UNIT_CONFLICTED_BY], i) { r = transaction_add_job_and_dependencies(tr, JOB_STOP, dep, ret, false, override, false, false, ignore_order, e); if (r < 0) { - log_warning_unit(dep->id, + log_unit_warning(dep->id, "Cannot add dependency job for unit %s, ignoring: %s", dep->id, bus_error_message(e, r)); @@ -1065,7 +1065,7 @@ int transaction_add_job_and_dependencies( SET_FOREACH(dep, ret->unit->dependencies[UNIT_PROPAGATES_RELOAD_TO], i) { r = transaction_add_job_and_dependencies(tr, JOB_RELOAD, dep, ret, false, override, false, false, ignore_order, e); if (r < 0) { - log_warning_unit(dep->id, + log_unit_warning(dep->id, "Cannot add dependency reload job for unit %s, ignoring: %s", dep->id, bus_error_message(e, r)); @@ -1112,7 +1112,7 @@ int transaction_add_isolate_jobs(Transaction *tr, Manager *m) { r = transaction_add_job_and_dependencies(tr, JOB_STOP, u, tr->anchor_job, true, false, false, false, false, NULL); if (r < 0) - log_warning_unit(u->id, + log_unit_warning(u->id, "Cannot add isolate job for unit %s, ignoring: %s", u->id, strerror(-r)); }