diff options
author | Lennart Poettering <lennart@poettering.net> | 2011-03-18 04:31:22 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2011-03-18 04:53:31 +0100 |
commit | f1dd0c3f9b4a257e81ff9c6a08070c702a0db45a (patch) | |
tree | 34ae8bb9ab04facd195a83a6300306edac96479e /src/unit.c | |
parent | 0732ec002ea941f32e8def518150d2b6423315e3 (diff) |
syslog: rework syslog detection so that we need no compile-time option what the name of the syslog implementation is
Diffstat (limited to 'src/unit.c')
-rw-r--r-- | src/unit.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/unit.c b/src/unit.c index 10de40affc..6f10f51fbd 100644 --- a/src/unit.c +++ b/src/unit.c @@ -1224,12 +1224,6 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su * yet connected. */ bus_init(u->meta.manager, true); - if (unit_has_name(u, SPECIAL_SYSLOG_SERVICE)) - /* The syslog daemon just might have become - * available, hence try to connect to it, if - * we aren't yet connected. */ - log_open(); - if (u->meta.type == UNIT_SERVICE && !UNIT_IS_ACTIVE_OR_RELOADING(os)) { /* Write audit record if we have just finished starting up */ @@ -1242,12 +1236,6 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su } else { - if (unit_has_name(u, SPECIAL_SYSLOG_SERVICE)) - /* The syslog daemon might just have - * terminated, hence try to disconnect from - * it. */ - log_close_syslog(); - /* We don't care about D-Bus here, since we'll get an * asynchronous notification for it anyway. */ @@ -1277,6 +1265,8 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su unit_add_to_dbus_queue(u); unit_add_to_gc_queue(u); + + manager_recheck_syslog(u->meta.manager); } int unit_watch_fd(Unit *u, int fd, uint32_t events, Watch *w) { |