picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

systemd: raise level of message about lookup paths 

This can be pretty important for the user, and is not trivial
to figure out in all cases.

Also show failing path in error messages.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-02-02 10:36:11 -05:00
parent 0783951b93
commit 7ad94c716d
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/manager.c
View File

@ -2263,7 +2263,8 @@ static int create_generator_dir(Manager *m, char **generator, const char *name)
r = mkdir_p_label(p, 0755);
if (r < 0) {
log_error("Failed to create generator directory: %s", strerror(-r));
log_error("Failed to create generator directory %s: %s",
p, strerror(-r));
free(p);
return r;
}
@ -2274,7 +2275,8 @@ static int create_generator_dir(Manager *m, char **generator, const char *name)
if (!mkdtemp(p)) {
free(p);
log_error("Failed to create generator directory: %m");
log_error("Failed to create generator directory %s: %m",
p);
return -errno;
}
}
@ -2313,7 +2315,8 @@ void manager_run_generators(Manager *m) {
if (errno == ENOENT)
return;
log_error("Failed to enumerate generator directory: %m");
log_error("Failed to enumerate generator directory %s: %m",
generator_path);
return;
}

24
src/shared/path-lookup.c
View File

@ -239,7 +239,6 @@ int lookup_paths_init(
const char *generator_late) {
const char *e;
char *t;
assert(p);
@ -318,14 +317,12 @@ int lookup_paths_init(
strv_uniq(p->unit_path);
if (!strv_isempty(p->unit_path)) {
t = strv_join(p->unit_path, "\n\t");
char _cleanup_free_ *t = strv_join(p->unit_path, "\n\t");
if (!t)
return -ENOMEM;
log_debug("Looking for unit files in:\n\t%s", t);
free(t);
log_info("Looking for unit files in (higher priority first):\n\t%s", t);
} else {
log_debug("Ignoring unit files.");
log_info("Ignoring unit files.");
strv_free(p->unit_path);
p->unit_path = NULL;
}
@ -380,33 +377,30 @@ int lookup_paths_init(
strv_uniq(p->sysvrcnd_path);
if (!strv_isempty(p->sysvinit_path)) {
t = strv_join(p->sysvinit_path, "\n\t");
char _cleanup_free_ *t = strv_join(p->sysvinit_path, "\n\t");
if (!t)
return -ENOMEM;
log_debug("Looking for SysV init scripts in:\n\t%s", t);
free(t);
log_info("Looking for SysV init scripts in:\n\t%s", t);
} else {
log_debug("Ignoring SysV init scripts.");
log_info("Ignoring SysV init scripts.");
strv_free(p->sysvinit_path);
p->sysvinit_path = NULL;
}
if (!strv_isempty(p->sysvrcnd_path)) {
t = strv_join(p->sysvrcnd_path, "\n\t");
char _cleanup_free_ *t =
strv_join(p->sysvrcnd_path, "\n\t");
if (!t)
return -ENOMEM;
log_debug("Looking for SysV rcN.d links in:\n\t%s", t);
free(t);
} else {
log_debug("Ignoring SysV rcN.d links.");
strv_free(p->sysvrcnd_path);
p->sysvrcnd_path = NULL;
}
#else
log_debug("Disabled SysV init scripts and rcN.d links support");
log_info("SysV init scripts and rcN.d links support disabled");
#endif
}