diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-10-10 01:57:06 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-10-10 01:57:06 +0200 |
| commit | 77ad3b93de65c27cc82dbccc7d336c3aff768c77 (patch) | |
| tree | 5a6ed9a3a2ad3864b1ba85c0472b8a2d631f6a5e /src/journal/journal-gatewayd.c | |
| parent | a3eb665e0c12df35e807611582e7332ebed325b1 (diff) | |
journal: fix seeking backwards in gateway daemon
Diffstat (limited to 'src/journal/journal-gatewayd.c')
| -rw-r--r-- | src/journal/journal-gatewayd.c | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/src/journal/journal-gatewayd.c b/src/journal/journal-gatewayd.c index b6a9a2a28..274ef5ffe 100644 --- a/src/journal/journal-gatewayd.c +++ b/src/journal/journal-gatewayd.c @@ -180,15 +180,9 @@ static ssize_t request_reader_entries( m->n_entries <= 0) return MHD_CONTENT_READER_END_OF_STREAM; - if (m->n_skip < 0) { - r = sd_journal_previous_skip(m->journal, (uint64_t) -m->n_skip); - - /* We couldn't seek this far backwards? Then - * let's try to look forward... */ - if (r == 0) - r = sd_journal_next(m->journal); - - } else if (m->n_skip > 0) + if (m->n_skip < 0) + r = sd_journal_previous_skip(m->journal, (uint64_t) -m->n_skip + 1); + else if (m->n_skip > 0) r = sd_journal_next_skip(m->journal, (uint64_t) m->n_skip + 1); else r = sd_journal_next(m->journal); @@ -442,13 +436,6 @@ static int request_handler_entries( if (request_parse_arguments(m, connection) < 0) return respond_error(connection, MHD_HTTP_BAD_REQUEST, "Failed to parse URL arguments.\n"); - /* log_info("cursor = %s", m->cursor); */ - /* log_info("skip = %lli", m->n_skip); */ - /* if (!m->n_entries_set) */ - /* log_info("n_entries not set!"); */ - /* else */ - /* log_info("n_entries = %llu", m->n_entries); */ - if (m->cursor) r = sd_journal_seek_cursor(m->journal, m->cursor); else if (m->n_skip >= 0) @@ -656,7 +643,7 @@ int main(int argc, char *argv[]) { goto finish; } - log_set_target(LOG_TARGET_KMSG); + log_set_target(LOG_TARGET_AUTO); log_parse_environment(); log_open(); |