diff options
Diffstat (limited to 'web/api')
| -rw-r--r-- | web/api/queries/query.c | 4 | ||||
| -rw-r--r-- | web/api/web_api_v1.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/web/api/queries/query.c b/web/api/queries/query.c index b7e89ee978..76d673cae1 100644 --- a/web/api/queries/query.c +++ b/web/api/queries/query.c @@ -3617,12 +3617,12 @@ RRDR *rrd2rrdr(ONEWAYALLOC *owa, QUERY_TARGET *qt) { bool cancel = false; if (qt->request.interrupt_callback && qt->request.interrupt_callback(qt->request.interrupt_callback_data)) { cancel = true; - netdata_log_access("QUERY INTERRUPTED"); + nd_log(NDLS_ACCESS, NDLP_NOTICE, "QUERY INTERRUPTED"); } if (qt->request.timeout_ms && ((NETDATA_DOUBLE)(now_ut - qt->timings.received_ut) / 1000.0) > (NETDATA_DOUBLE)qt->request.timeout_ms) { cancel = true; - netdata_log_access("QUERY CANCELED RUNTIME EXCEEDED %0.2f ms (LIMIT %lld ms)", + nd_log(NDLS_ACCESS, NDLP_WARNING, "QUERY CANCELED RUNTIME EXCEEDED %0.2f ms (LIMIT %lld ms)", (NETDATA_DOUBLE)(now_ut - qt->timings.received_ut) / 1000.0, (long long)qt->request.timeout_ms); } diff --git a/web/api/web_api_v1.c b/web/api/web_api_v1.c index ec0a0b6d61..e08f8aa2f8 100644 --- a/web/api/web_api_v1.c +++ b/web/api/web_api_v1.c @@ -1410,7 +1410,10 @@ int web_client_api_request_v1_function(RRDHOST *host, struct web_client *w, char wb->content_type = CT_APPLICATION_JSON; buffer_no_cacheable(wb); - return rrd_function_run(host, wb, timeout, function, true, NULL, + char transaction[UUID_COMPACT_STR_LEN]; + uuid_unparse_lower_compact(w->transaction, transaction); + + return rrd_function_run(host, wb, timeout, function, true, transaction, NULL, NULL, web_client_interrupt_callback, w, NULL); } |