X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournald.c;h=28a423326e4b0cb6006795829879565822e44aa7;hb=27cc6f166bdebc0e698fb692993b801db2618866;hp=b1a0e25d0cee575149cd37d639ee9a4ee51e0811;hpb=73f860db9893deab6aebceb53dd7d0deb662e832;p=elogind.git
diff --git a/src/journal/journald.c b/src/journal/journald.c
index b1a0e25d0..28a423326 100644
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -19,12 +19,8 @@
along with systemd; If not, see .
***/
-#include
-#include
-#include
#include
-#include "systemd/sd-journal.h"
#include "systemd/sd-messages.h"
#include "systemd/sd-daemon.h"
@@ -33,6 +29,8 @@
#include "journald-kmsg.h"
#include "journald-syslog.h"
+#include "sigbus.h"
+
int main(int argc, char *argv[]) {
Server server;
int r;
@@ -49,6 +47,8 @@ int main(int argc, char *argv[]) {
umask(0022);
+ sigbus_install();
+
r = server_init(&server);
if (r < 0)
goto finish;
@@ -104,7 +104,7 @@ int main(int argc, char *argv[]) {
r = sd_event_run(server.event, t);
if (r < 0) {
- log_error("Failed to run event loop: %s", strerror(-r));
+ log_error_errno(r, "Failed to run event loop: %m");
goto finish;
}
@@ -116,7 +116,9 @@ int main(int argc, char *argv[]) {
server_driver_message(&server, SD_MESSAGE_JOURNAL_STOP, "Journal stopped");
finish:
- sd_notify(false, "STATUS=Shutting down...");
+ sd_notify(false,
+ "STOPPING=1\n"
+ "STATUS=Shutting down...");
server_done(&server);