chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
timesyncd: Support timesyncd.conf.d directories in the usual search paths
[elogind.git]
/
src
/
journal
/
journald.c
diff --git
a/src/journal/journald.c
b/src/journal/journald.c
index aa12fa785db9ca82444afb885db6dc8a8395fc64..604c8617bb47aa0340b112a8eca6944f6eb49a71 100644
(file)
--- a/
src/journal/journald.c
+++ b/
src/journal/journald.c
@@
-24,9
+24,9
@@
#include <errno.h>
#include <unistd.h>
#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"
#include "journal-authenticate.h"
#include "journald-server.h"
@@
-37,11
+37,6
@@
int main(int argc, char *argv[]) {
Server server;
int r;
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;
if (argc > 1) {
log_error("This program does not take arguments.");
return EXIT_FAILURE;
@@
-62,7
+57,7
@@
int main(int argc, char *argv[]) {
server_flush_to_var(&server);
server_flush_dev_kmsg(&server);
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,
server_driver_message(&server, SD_MESSAGE_JOURNAL_START, "Journal started");
sd_notify(false,
@@
-70,7
+65,13
@@
int main(int argc, char *argv[]) {
"STATUS=Processing requests...");
for (;;) {
"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)
+ goto finish;
+ if (r == SD_EVENT_FINISHED)
+ break;
n = now(CLOCK_REALTIME);
n = now(CLOCK_REALTIME);
@@
-103,8
+104,7
@@
int main(int argc, char *argv[]) {
r = sd_event_run(server.event, t);
if (r < 0) {
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;
}
goto finish;
}
@@
-112,11
+112,13
@@
int main(int argc, char *argv[]) {
server_maybe_warn_forward_syslog_missed(&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:
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);
server_done(&server);