chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unit: fix false positive in check for unneeded unit
[elogind.git]
/
src
/
unit.c
diff --git
a/src/unit.c
b/src/unit.c
index 903a8e4da4a4ae6731ad2c7b6d3839fa506448a1..56137d7bd14c60ae423c80884d0cb48a5dd536aa 100644
(file)
--- a/
src/unit.c
+++ b/
src/unit.c
@@
-564,8
+564,8
@@
int unit_add_exec_dependencies(Unit *u, ExecContext *c) {
c->std_output != EXEC_OUTPUT_KMSG_AND_CONSOLE &&
c->std_output != EXEC_OUTPUT_SYSLOG_AND_CONSOLE &&
c->std_error != EXEC_OUTPUT_KMSG &&
c->std_output != EXEC_OUTPUT_KMSG_AND_CONSOLE &&
c->std_output != EXEC_OUTPUT_SYSLOG_AND_CONSOLE &&
c->std_error != EXEC_OUTPUT_KMSG &&
- c->std_error != EXEC_OUTPUT_SYSLOG
_AND_CONSOLE
&&
- c->std_error != EXEC_OUTPUT_KMSG &&
+ c->std_error != EXEC_OUTPUT_SYSLOG &&
+ c->std_error != EXEC_OUTPUT_KMSG
_AND_CONSOLE
&&
c->std_error != EXEC_OUTPUT_SYSLOG_AND_CONSOLE)
return 0;
c->std_error != EXEC_OUTPUT_SYSLOG_AND_CONSOLE)
return 0;
@@
-858,6
+858,7
@@
fail:
u->meta.load_state = UNIT_ERROR;
u->meta.load_error = r;
unit_add_to_dbus_queue(u);
u->meta.load_state = UNIT_ERROR;
u->meta.load_error = r;
unit_add_to_dbus_queue(u);
+ unit_add_to_gc_queue(u);
log_debug("Failed to load configuration for %s: %s", u->meta.id, strerror(-r));
log_debug("Failed to load configuration for %s: %s", u->meta.id, strerror(-r));
@@
-924,7
+925,7
@@
int unit_start(Unit *u) {
unit_add_to_dbus_queue(u);
unit_add_to_dbus_queue(u);
- unit_status_printf(u,
"Starting %s...\n
", unit_description(u));
+ unit_status_printf(u,
NULL, "Starting %s...
", unit_description(u));
return UNIT_VTABLE(u)->start(u);
}
return UNIT_VTABLE(u)->start(u);
}
@@
-966,7
+967,7
@@
int unit_stop(Unit *u) {
unit_add_to_dbus_queue(u);
unit_add_to_dbus_queue(u);
- unit_status_printf(u,
"Stopping %s...\n
", unit_description(u));
+ unit_status_printf(u,
NULL, "Stopping %s...
", unit_description(u));
return UNIT_VTABLE(u)->stop(u);
}
return UNIT_VTABLE(u)->stop(u);
}
@@
-1031,19
+1032,19
@@
static void unit_check_unneeded(Unit *u) {
return;
SET_FOREACH(other, u->meta.dependencies[UNIT_REQUIRED_BY], i)
return;
SET_FOREACH(other, u->meta.dependencies[UNIT_REQUIRED_BY], i)
- if (
!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)
))
+ if (
unit_pending_active(other
))
return;
SET_FOREACH(other, u->meta.dependencies[UNIT_REQUIRED_BY_OVERRIDABLE], i)
return;
SET_FOREACH(other, u->meta.dependencies[UNIT_REQUIRED_BY_OVERRIDABLE], i)
- if (
!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)
))
+ if (
unit_pending_active(other
))
return;
SET_FOREACH(other, u->meta.dependencies[UNIT_WANTED_BY], i)
return;
SET_FOREACH(other, u->meta.dependencies[UNIT_WANTED_BY], i)
- if (
!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)
))
+ if (
unit_pending_active(other
))
return;
SET_FOREACH(other, u->meta.dependencies[UNIT_BOUND_BY], i)
return;
SET_FOREACH(other, u->meta.dependencies[UNIT_BOUND_BY], i)
- if (
!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)
))
+ if (
unit_pending_active(other
))
return;
log_info("Service %s is not needed anymore. Stopping.", u->meta.id);
return;
log_info("Service %s is not needed anymore. Stopping.", u->meta.id);
@@
-2426,8
+2427,11
@@
int unit_coldplug(Unit *u) {
return 0;
}
return 0;
}
-void unit_status_printf(Unit *u, const char *format, ...) {
+void unit_status_printf(Unit *u, const char *
status, const char *
format, ...) {
va_list ap;
va_list ap;
+ char *s, *e;
+ int err;
+ const unsigned emax = status ? 80 - (sizeof("[ OK ]")-1) : 80;
assert(u);
assert(format);
assert(u);
assert(format);
@@
-2442,8
+2446,21
@@
void unit_status_printf(Unit *u, const char *format, ...) {
return;
va_start(ap, format);
return;
va_start(ap, format);
-
status_vprintf(
format, ap);
+
err = vasprintf(&s,
format, ap);
va_end(ap);
va_end(ap);
+ if (err < 0)
+ return;
+
+ e = ellipsize(s, emax, 100);
+ free(s);
+ if (!e)
+ return;
+
+ if (status)
+ status_printf("%s%*s[%s]\n", e, emax - strlen(e), "", status);
+ else
+ status_printf("%s\n", e);
+ free(e);
}
bool unit_need_daemon_reload(Unit *u) {
}
bool unit_need_daemon_reload(Unit *u) {
@@
-2501,7
+2518,7
@@
bool unit_pending_inactive(Unit *u) {
bool unit_pending_active(Unit *u) {
assert(u);
bool unit_pending_active(Unit *u) {
assert(u);
- /* Returns true if the unit is
inactive or going down
*/
+ /* Returns true if the unit is
active or going up
*/
if (UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(u)))
return true;
if (UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(u)))
return true;