#include <errno.h>
#include <unistd.h>
-#include <systemd/sd-journal.h>
-#include <systemd/sd-messages.h>
-#include <systemd/sd-daemon.h>
+#include "systemd/sd-journal.h"
+#include "systemd/sd-messages.h"
+#include "systemd/sd-daemon.h"
#include "journal-authenticate.h"
#include "journald-server.h"
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;
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,
"STATUS=Processing requests...");
for (;;) {
- struct epoll_event event;
- int t = -1;
- usec_t n;
+ usec_t t = USEC_INFINITY, n;
+
+ r = sd_event_get_state(server.event);
+ if (r < 0)
+ goto finish;
+ if (r == SD_EVENT_FINISHED)
+ break;
n = now(CLOCK_REALTIME);
}
/* Calculate when to rotate the next time */
- t = (int) ((server.oldest_file_usec + server.max_retention_usec - n + USEC_PER_MSEC - 1) / USEC_PER_MSEC);
- log_info("Sleeping for %i ms", t);
+ t = server.oldest_file_usec + server.max_retention_usec - n;
}
#ifdef HAVE_GCRYPT
if (n >= u)
t = 0;
else
- t = MIN(t, (int) ((u - n + USEC_PER_MSEC - 1) / USEC_PER_MSEC));
+ t = MIN(t, u - n);
}
}
#endif
- r = epoll_wait(server.epoll_fd, &event, 1, t);
+ r = sd_event_run(server.event, t);
if (r < 0) {
-
- if (errno == EINTR)
- continue;
-
- log_error("epoll_wait() failed: %m");
- r = -errno;
+ log_error_errno(r, "Failed to run event loop: %m");
goto finish;
}
- if (r > 0) {
- r = process_event(&server, &event);
- if (r < 0)
- goto finish;
- else if (r == 0)
- break;
- }
-
server_maybe_append_tags(&server);
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,
+ "STOPPING=1\n"
"STATUS=Shutting down...");
server_done(&server);