This is an automated email from the ASF dual-hosted git repository.
zhaoqingran pushed a commit to branch log-oltp
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
The following commit(s) were added to refs/heads/log-oltp by this push:
new 6bdd4c5c7 modify api endpoints
6bdd4c5c7 is described below
commit 6bdd4c5c7d885fe32caa36297579fccc07842d90
Author: Logic <[email protected]>
AuthorDate: Mon Nov 18 23:35:50 2024 +0800
modify api endpoints
---
.../log/victorialogs/controller/LogAnalysisController.java | 10 +++++-----
.../hertzbeat/log/victorialogs/service/LogAnalysisService.java | 3 ---
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git
a/hertzbeat-log/src/main/java/org/apache/hertzbeat/log/victorialogs/controller/LogAnalysisController.java
b/hertzbeat-log/src/main/java/org/apache/hertzbeat/log/victorialogs/controller/LogAnalysisController.java
index aba4ea7cc..98982b2ba 100644
---
a/hertzbeat-log/src/main/java/org/apache/hertzbeat/log/victorialogs/controller/LogAnalysisController.java
+++
b/hertzbeat-log/src/main/java/org/apache/hertzbeat/log/victorialogs/controller/LogAnalysisController.java
@@ -49,7 +49,7 @@ public class LogAnalysisController {
private LogAnalysisService logAnalysisService;
@Operation(summary = "Search logs", description = "Search logs with query
parameters")
- @GetMapping(value = "/search", produces = APPLICATION_JSON_VALUE)
+ @GetMapping(value = "/query", produces = APPLICATION_JSON_VALUE)
public ResponseEntity<Message<List<LogQueryResponse>>> searchLogs(
@Parameter(description = "Log query expression", required = true)
@RequestParam @NotBlank String query,
@@ -112,15 +112,15 @@ public class LogAnalysisController {
}
}
- @GetMapping(value = "/stream", produces =
MediaType.TEXT_EVENT_STREAM_VALUE)
+ @GetMapping(value = "/tail", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
public SseEmitter streamLogs(@RequestParam String query) {
- SseEmitter emitter = new SseEmitter(180000L); // 3 minutes timeout
+ SseEmitter emitter = new SseEmitter(0L);
logAnalysisService.streamLogs(query, emitter);
return emitter;
}
@Operation(summary = "Stop all streams", description = "Stop all active
log streams")
- @PostMapping(value = "/stream/stop", produces = APPLICATION_JSON_VALUE)
+ @PostMapping(value = "/tail/stop", produces = APPLICATION_JSON_VALUE)
public ResponseEntity<Message<String>> stopAllStreams() {
try {
logAnalysisService.stopAllStreams();
@@ -132,7 +132,7 @@ public class LogAnalysisController {
}
@Operation(summary = "Get active stream count", description = "Get the
number of active log streams")
- @GetMapping(value = "/stream/count", produces = APPLICATION_JSON_VALUE)
+ @GetMapping(value = "/tail/count", produces = APPLICATION_JSON_VALUE)
public ResponseEntity<Message<Integer>> getActiveStreamCount() {
try {
int count = logAnalysisService.getActiveStreamCount();
diff --git
a/hertzbeat-log/src/main/java/org/apache/hertzbeat/log/victorialogs/service/LogAnalysisService.java
b/hertzbeat-log/src/main/java/org/apache/hertzbeat/log/victorialogs/service/LogAnalysisService.java
index e1085369f..88925e7f4 100644
---
a/hertzbeat-log/src/main/java/org/apache/hertzbeat/log/victorialogs/service/LogAnalysisService.java
+++
b/hertzbeat-log/src/main/java/org/apache/hertzbeat/log/victorialogs/service/LogAnalysisService.java
@@ -115,19 +115,16 @@ public class LogAnalysisService {
// Set up completion callback
emitter.onCompletion(() -> {
- log.debug("SSE completed");
cleanup(emitter, heartbeatFuture);
});
// Set up timeout callback
emitter.onTimeout(() -> {
- log.debug("SSE timeout");
cleanup(emitter, heartbeatFuture);
});
// Set up error callback
emitter.onError(ex -> {
- log.error("SSE error", ex);
cleanup(emitter, heartbeatFuture);
});
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
