summaryrefslogtreecommitdiff
path: root/src/analyze/analyze-verify.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-05-11 20:38:21 +0200
committerLennart Poettering <lennart@poettering.net>2015-05-11 22:24:45 +0200
commitf2341e0a87cab1558c84c933956e9181d5fb6c52 (patch)
tree536878a0b833b532321b34613b20684d8fcf0624 /src/analyze/analyze-verify.c
parent6f856a0992aee3fb06cb13a761b902657ff228ea (diff)
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object insted of just a unit name as parameter. The call will now prefix all logged messages with the unit name, thus allowing the unit name to be dropped from the various passed romat strings, simplifying invocations drastically, and unifying log output across messages. Also, UNIT= vs. USER_UNIT= is now derived from the Manager object attached to the Unit object, instead of getpid(). This has the benefit of correcting the field for --test runs. Also contains a couple of other logging improvements: - Drops a couple of strerror() invocations in favour of using %m. - Not only .mount units now warn if a symlinks exist for the mount point already, .automount units do that too, now. - A few invocations of log_struct() that didn't actually pass any additional structured data have been replaced by simpler invocations of log_unit_info() and friends. - For structured data a new LOG_UNIT_MESSAGE() macro has been added, that works like LOG_MESSAGE() but prefixes the message with the unit name. Similar, there's now LOG_LINK_MESSAGE() and LOG_NETDEV_MESSAGE(). - For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(), LOG_NETDEV_INTERFACE() macros have been added that generate the necessary per object fields. The old log_unit_struct() call has been removed in favour of these new macros used in raw log_struct() invocations. In addition to removing one more function call this allows generated structured log messages that contain two object fields, as necessary for example for network interfaces that are joined into another network interface, and whose messages shall be indexed by both. - The LOG_ERRNO() macro has been removed, in favour of log_struct_errno(). The latter has the benefit of ensuring that %m in format strings is properly resolved to the specified error number. - A number of logging messages have been converted to use log_unit_info() instead of log_info() - The client code in sysv-generator no longer #includes core code from src/core/. - log_unit_full_errno() has been removed, log_unit_full() instead takes an errno now, too. - log_unit_info(), log_link_info(), log_netdev_info() and friends, now avoid double evaluation of their parameters
Diffstat (limited to 'src/analyze/analyze-verify.c')
-rw-r--r--src/analyze/analyze-verify.c32
1 files changed, 12 insertions, 20 deletions
diff --git a/src/analyze/analyze-verify.c b/src/analyze/analyze-verify.c
index 4145812bc7..e7df55f5a5 100644
--- a/src/analyze/analyze-verify.c
+++ b/src/analyze/analyze-verify.c
@@ -72,8 +72,7 @@ static int verify_socket(Unit *u) {
/* This makes sure instance is created if necessary. */
r = socket_instantiate_service(SOCKET(u));
if (r < 0) {
- log_unit_error(u->id, "Socket %s cannot be started, failed to create instance.",
- u->id);
+ log_unit_error_errno(u, r, "Socket cannot be started, failed to create instance: %m");
return r;
}
@@ -82,11 +81,10 @@ static int verify_socket(Unit *u) {
Service *service;
service = SERVICE(UNIT_DEREF(SOCKET(u)->service));
- log_unit_debug(u->id, "%s uses %s", u->id, UNIT(service)->id);
+ log_unit_debug(u, "Using %s", UNIT(service)->id);
if (UNIT(service)->load_state != UNIT_LOADED) {
- log_unit_error(u->id, "Service %s not loaded, %s cannot be started.",
- UNIT(service)->id, u->id);
+ log_unit_error(u, "Service %s not loaded, %s cannot be started.", UNIT(service)->id, u->id);
return -ENOENT;
}
}
@@ -98,11 +96,8 @@ static int verify_executable(Unit *u, ExecCommand *exec) {
if (exec == NULL)
return 0;
- if (access(exec->path, X_OK) < 0) {
- log_unit_error(u->id, "%s: command %s is not executable: %m",
- u->id, exec->path);
- return -errno;
- }
+ if (access(exec->path, X_OK) < 0)
+ return log_unit_error_errno(u, errno, "Command %s is not executable: %m", exec->path);
return 0;
}
@@ -143,16 +138,15 @@ static int verify_documentation(Unit *u, bool check_man) {
int r = 0, k;
STRV_FOREACH(p, u->documentation) {
- log_unit_debug(u->id, "%s: found documentation item %s.", u->id, *p);
+ log_unit_debug(u, "Found documentation item: %s", *p);
+
if (check_man && startswith(*p, "man:")) {
k = show_man_page(*p + 4, true);
if (k != 0) {
if (k < 0)
- log_unit_error(u->id, "%s: can't show %s: %s",
- u->id, *p, strerror(-r));
+ log_unit_error_errno(u, r, "Can't show %s: %m", *p);
else {
- log_unit_error(u->id, "%s: man %s command failed with code %d",
- u->id, *p + 4, k);
+ log_unit_error_errno(u, r, "man %s command failed with code %d", *p + 4, k);
k = -ENOEXEC;
}
if (r == 0)
@@ -176,14 +170,12 @@ static int verify_unit(Unit *u, bool check_man) {
if (log_get_max_level() >= LOG_DEBUG)
unit_dump(u, stdout, "\t");
- log_unit_debug(u->id, "Creating %s/start job", u->id);
+ log_unit_debug(u, "Creating %s/start job", u->id);
r = manager_add_job(u->manager, JOB_START, u, JOB_REPLACE, false, &err, &j);
if (sd_bus_error_is_set(&err))
- log_unit_error(u->id, "Error: %s: %s",
- err.name, err.message);
+ log_unit_error(u, "Error: %s: %s", err.name, err.message);
if (r < 0)
- log_unit_error(u->id, "Failed to create %s/start: %s",
- u->id, strerror(-r));
+ log_unit_error_errno(u, r, "Failed to create %s/start: %m", u->id);
k = verify_socket(u);
if (k < 0 && r == 0)