X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournal-gatewayd.c;h=eea3530733b8a3bc193200df5d7999c7ed0e31c3;hb=a2ab7ee6122a5006cafc45d7b81f726656fb65cc;hp=b7acfba99f6b44a64a7b62a488bfdb83e81c061f;hpb=7b17a7d72f5ba5ad838b19803534c56a46f3bce9;p=elogind.git diff --git a/src/journal/journal-gatewayd.c b/src/journal/journal-gatewayd.c index b7acfba99..eea353073 100644 --- a/src/journal/journal-gatewayd.c +++ b/src/journal/journal-gatewayd.c @@ -45,12 +45,18 @@ typedef struct RequestMeta { FILE *tmp; uint64_t delta, size; + + int argument_parse_error; + + bool follow; + bool discrete; } RequestMeta; static const char* const mime_types[_OUTPUT_MODE_MAX] = { [OUTPUT_SHORT] = "text/plain", [OUTPUT_JSON] = "application/json", - [OUTPUT_EXPORT] = "application/vnd.fdo.journal" + [OUTPUT_JSON_SSE] = "text/event-stream", + [OUTPUT_EXPORT] = "application/vnd.fdo.journal", }; static RequestMeta *request_meta(void **connection_cls) { @@ -176,15 +182,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); @@ -192,8 +192,33 @@ static ssize_t request_reader_entries( if (r < 0) { log_error("Failed to advance journal pointer: %s", strerror(-r)); return MHD_CONTENT_READER_END_WITH_ERROR; - } else if (r == 0) + } else if (r == 0) { + + if (m->follow) { + r = sd_journal_wait(m->journal, (uint64_t) -1); + if (r < 0) { + log_error("Couldn't wait for journal event: %s", strerror(-r)); + return MHD_CONTENT_READER_END_WITH_ERROR; + } + + continue; + } + return MHD_CONTENT_READER_END_OF_STREAM; + } + + if (m->discrete) { + assert(m->cursor); + + r = sd_journal_test_cursor(m->journal, m->cursor); + if (r < 0) { + log_error("Failed to test cursor: %s", strerror(-r)); + return MHD_CONTENT_READER_END_WITH_ERROR; + } + + if (r == 0) + return MHD_CONTENT_READER_END_OF_STREAM; + } pos -= m->size; m->delta += m->size; @@ -251,18 +276,20 @@ static int request_parse_accept( RequestMeta *m, struct MHD_Connection *connection) { - const char *accept; + const char *header; assert(m); assert(connection); - accept = MHD_lookup_connection_value(connection, MHD_HEADER_KIND, "Accept"); - if (!accept) + header = MHD_lookup_connection_value(connection, MHD_HEADER_KIND, "Accept"); + if (!header) return 0; - if (streq(accept, mime_types[OUTPUT_JSON])) + if (streq(header, mime_types[OUTPUT_JSON])) m->mode = OUTPUT_JSON; - else if (streq(accept, mime_types[OUTPUT_EXPORT])) + else if (streq(header, mime_types[OUTPUT_JSON_SSE])) + m->mode = OUTPUT_JSON_SSE; + else if (streq(header, mime_types[OUTPUT_EXPORT])) m->mode = OUTPUT_EXPORT; else m->mode = OUTPUT_SHORT; @@ -337,6 +364,83 @@ static int request_parse_range( return 0; } +static int request_parse_arguments_iterator( + void *cls, + enum MHD_ValueKind kind, + const char *key, + const char *value) { + + RequestMeta *m = cls; + _cleanup_free_ char *p = NULL; + int r; + + assert(m); + + if (isempty(key)) { + m->argument_parse_error = -EINVAL; + return MHD_NO; + } + + if (streq(key, "follow")) { + if (isempty(value)) { + m->follow = true; + return MHD_YES; + } + + r = parse_boolean(value); + if (r < 0) { + m->argument_parse_error = r; + return MHD_NO; + } + + m->follow = r; + return MHD_YES; + } + + if (streq(key, "discrete")) { + if (isempty(value)) { + m->discrete = true; + return MHD_YES; + } + + r = parse_boolean(value); + if (r < 0) { + m->argument_parse_error = r; + return MHD_NO; + } + + m->discrete = r; + return MHD_YES; + } + + p = strjoin(key, "=", strempty(value), NULL); + if (!p) { + m->argument_parse_error = log_oom(); + return MHD_NO; + } + + r = sd_journal_add_match(m->journal, p, 0); + if (r < 0) { + m->argument_parse_error = r; + return MHD_NO; + } + + return MHD_YES; +} + +static int request_parse_arguments( + RequestMeta *m, + struct MHD_Connection *connection) { + + assert(m); + assert(connection); + + m->argument_parse_error = 0; + MHD_get_connection_values(connection, MHD_GET_ARGUMENT_KIND, request_parse_arguments_iterator, m); + + return m->argument_parse_error; +} + static int request_handler_entries( struct MHD_Connection *connection, void **connection_cls) { @@ -362,12 +466,16 @@ static int request_handler_entries( if (request_parse_range(m, connection) < 0) return respond_error(connection, MHD_HTTP_BAD_REQUEST, "Failed to parse Range header.\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 (request_parse_arguments(m, connection) < 0) + return respond_error(connection, MHD_HTTP_BAD_REQUEST, "Failed to parse URL arguments.\n"); + + if (m->discrete) { + if (!m->cursor) + return respond_error(connection, MHD_HTTP_BAD_REQUEST, "Discrete seeks require a cursor specification.\n"); + + m->n_entries = 1; + m->n_entries_set = true; + } if (m->cursor) r = sd_journal_seek_cursor(m->journal, m->cursor); @@ -399,7 +507,7 @@ static int request_handler_redirect( int ret; assert(connection); - assert(page); + assert(target); if (asprintf(&page, "Please continue to the journal browser.", target) < 0) return respond_oom(connection); @@ -568,7 +676,7 @@ static int request_handler( } int main(int argc, char *argv[]) { - struct MHD_Daemon *daemon = NULL; + struct MHD_Daemon *d = NULL; int r = EXIT_FAILURE, n; if (argc > 1) { @@ -576,7 +684,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(); @@ -588,7 +696,7 @@ int main(int argc, char *argv[]) { log_error("Can't listen on more than one socket."); goto finish; } else if (n > 0) { - daemon = MHD_start_daemon( + d = MHD_start_daemon( MHD_USE_THREAD_PER_CONNECTION|MHD_USE_POLL|MHD_USE_DEBUG, 19531, NULL, NULL, @@ -597,7 +705,7 @@ int main(int argc, char *argv[]) { MHD_OPTION_NOTIFY_COMPLETED, request_meta_free, NULL, MHD_OPTION_END); } else { - daemon = MHD_start_daemon( + d = MHD_start_daemon( MHD_USE_DEBUG|MHD_USE_THREAD_PER_CONNECTION|MHD_USE_POLL, 19531, NULL, NULL, @@ -606,7 +714,7 @@ int main(int argc, char *argv[]) { MHD_OPTION_END); } - if (!daemon) { + if (!d) { log_error("Failed to start daemon!"); goto finish; } @@ -616,8 +724,8 @@ int main(int argc, char *argv[]) { r = EXIT_SUCCESS; finish: - if (daemon) - MHD_stop_daemon(daemon); + if (d) + MHD_stop_daemon(d); return r; }