diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-04-06 10:50:46 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-04-06 10:50:46 +0200 |
| commit | 354362c46bf436bb47fe6bd4be99321406119fa2 (patch) | |
| tree | b161da21bcea4ad2bb4f71f6d9f70b16ae2b3469 /src/journal-remote/journal-upload.c | |
| parent | d4337c15d5835c8eecf079bd5173f8b5c51727c7 (diff) | |
| parent | 0aa176a751a00b5645007c4d0763078ce2824aba (diff) | |
Merge pull request #2968 from keszybz/journal-upload-watchdog-update-master
Journal upload watchdog update master
Diffstat (limited to 'src/journal-remote/journal-upload.c')
| -rw-r--r-- | src/journal-remote/journal-upload.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c index 6e1c3bb9ef..4647cfdeb3 100644 --- a/src/journal-remote/journal-upload.c +++ b/src/journal-remote/journal-upload.c @@ -463,6 +463,8 @@ static int setup_uploader(Uploader *u, const char *url, const char *state_file) if (r < 0) return log_error_errno(r, "Failed to set up signals: %m"); + (void) sd_watchdog_enabled(false, &u->watchdog_usec); + return load_cursor_state(u); } @@ -494,6 +496,7 @@ static int perform_upload(Uploader *u) { assert(u); + u->watchdog_timestamp = now(CLOCK_MONOTONIC); code = curl_easy_perform(u->easy); if (code) { if (u->error[0]) |