chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mount: clarify that we really need to replace the utab inotify code with the native...
[elogind.git]
/
src
/
journal
/
journald.c
diff --git
a/src/journal/journald.c
b/src/journal/journald.c
index d6b235c12b895ccc7cf4fc9a7a5de43280e2b907..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"
@@
-104,7
+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)
);
+ log_error
_errno(r, "Failed to run event loop: %m"
);
goto finish;
}
goto finish;
}
@@
-116,7
+116,9
@@
int main(int argc, char *argv[]) {
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);