diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-08-21 17:19:28 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-08-21 17:24:21 +0200 |
| commit | af4ec4309e8f82aad87a8d574785c12f8763d5f8 (patch) | |
| tree | a592a4d9bae7af0d2bfccd2206c0be32e0712c7b /src/journal-remote | |
| parent | 308d72dc1e2106f94ae637e2ea510e8d466d2af1 (diff) | |
notify: send STOPPING=1 from our daemons
Diffstat (limited to 'src/journal-remote')
| -rw-r--r-- | src/journal-remote/journal-remote.c | 6 | ||||
| -rw-r--r-- | src/journal-remote/journal-upload.c | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c index 7f422bfb37..1cc86aeaf3 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -1530,10 +1530,12 @@ int main(int argc, char **argv) { } } - server_destroy(&s); + sd_notifyf(false, + "STOPPING=1\n" + "STATUS=Shutting down after writing %" PRIu64 " entries...", s.event_count); log_info("Finishing after writing %" PRIu64 " entries", s.event_count); - sd_notify(false, "STATUS=Shutting down..."); + server_destroy(&s); free(arg_key); free(arg_cert); diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c index bdeeff6778..40c380aa9e 100644 --- a/src/journal-remote/journal-upload.c +++ b/src/journal-remote/journal-upload.c @@ -818,7 +818,10 @@ int main(int argc, char **argv) { } cleanup: - sd_notify(false, "STATUS=Shutting down..."); + sd_notify(false, + "STOPPING=1\n" + "STATUS=Shutting down..."); + destroy_uploader(&u); finish: |