X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournald.c;h=28a423326e4b0cb6006795829879565822e44aa7;hb=2eec67acbb00593e414549a7e5b35eb7dd776b1b;hp=37896d050da93c3c174007e029055d97707cb4df;hpb=565a9388f261c6e459e1726e358284ff687ec941;p=elogind.git
diff --git a/src/journal/journald.c b/src/journal/journald.c
index 37896d050..28a423326 100644
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -19,29 +19,22 @@
along with systemd; If not, see .
***/
-#include
-#include
-#include
#include
-#include
-#include
-#include
+#include "systemd/sd-messages.h"
+#include "systemd/sd-daemon.h"
#include "journal-authenticate.h"
#include "journald-server.h"
#include "journald-kmsg.h"
#include "journald-syslog.h"
+#include "sigbus.h"
+
int main(int argc, char *argv[]) {
Server server;
int r;
- /* if (getppid() != 1) { */
- /* log_error("This program should be invoked by init only."); */
- /* return EXIT_FAILURE; */
- /* } */
-
if (argc > 1) {
log_error("This program does not take arguments.");
return EXIT_FAILURE;
@@ -54,6 +47,8 @@ int main(int argc, char *argv[]) {
umask(0022);
+ sigbus_install();
+
r = server_init(&server);
if (r < 0)
goto finish;
@@ -62,7 +57,7 @@ int main(int argc, char *argv[]) {
server_flush_to_var(&server);
server_flush_dev_kmsg(&server);
- log_debug("systemd-journald running as pid %lu", (unsigned long) getpid());
+ log_debug("systemd-journald running as pid "PID_FMT, getpid());
server_driver_message(&server, SD_MESSAGE_JOURNAL_START, "Journal started");
sd_notify(false,
@@ -70,7 +65,7 @@ int main(int argc, char *argv[]) {
"STATUS=Processing requests...");
for (;;) {
- usec_t t = (usec_t) -1, n;
+ usec_t t = USEC_INFINITY, n;
r = sd_event_get_state(server.event);
if (r < 0)
@@ -109,8 +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));
- r = -errno;
+ log_error_errno(r, "Failed to run event loop: %m");
goto finish;
}
@@ -118,11 +112,13 @@ int main(int argc, char *argv[]) {
server_maybe_warn_forward_syslog_missed(&server);
}
- log_debug("systemd-journald stopped as pid %lu", (unsigned long) getpid());
+ log_debug("systemd-journald stopped as pid "PID_FMT, getpid());
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);