diff --git a/internal/api/api.go b/internal/api/api.go index 945d42da..7c6cf1ed 100644 --- a/internal/api/api.go +++ b/internal/api/api.go @@ -52,6 +52,7 @@ func Init() { HandleFunc("api/config", configHandler) HandleFunc("api/exit", exitHandler) HandleFunc("api/restart", restartHandler) + HandleFunc("api/log", logHandler) Handler = http.DefaultServeMux // 4th @@ -253,6 +254,40 @@ func restartHandler(w http.ResponseWriter, r *http.Request) { go shell.Restart() } +// logHandler handles HTTP requests for log buffer operations. +// It supports two HTTP methods: +// - GET: Retrieves the content of in-memory log and sends it back to the client as plain text. +// - DELETE: Clear the in-memory log buffer. +// +// The function expects a valid http.ResponseWriter and an http.Request as parameters. +// For a GET request, it reads the log from in-memory buffer and writes +// the content to the response writer with a "text/plain" content type. +// +// For a DELETE request, it clears the in-memory buffer. +// +// For any other HTTP method, it responds with an HTTP 400 (Bad Request) status. +// +// Parameters: +// - w http.ResponseWriter: The response writer to write the HTTP response to. +// - r *http.Request: The HTTP request object containing the request details. +// +// No return values are provided since the function writes directly to the response writer. +func logHandler(w http.ResponseWriter, r *http.Request) { + switch r.Method { + case "GET": + + // Send current state of the log file immediately + data := app.LogCollector.Bytes() + Response(w, data, "text/plain") + case "DELETE": + app.LogCollector.Reset() + + Response(w, "Log truncated", "text/plain") + default: + http.Error(w, "Method not allowed", http.StatusBadRequest) + } +} + type Source struct { ID string `json:"id,omitempty"` Name string `json:"name,omitempty"` diff --git a/internal/app/app.go b/internal/app/app.go index 6a432cf1..c0bf19ec 100644 --- a/internal/app/app.go +++ b/internal/app/app.go @@ -1,10 +1,12 @@ package app import ( + "bytes" "errors" "flag" "fmt" "io" + "os" "path/filepath" "runtime" @@ -25,6 +27,8 @@ var Info = map[string]any{ "version": Version, } +var LogCollector bytes.Buffer + func Init() { var confs Config var version bool @@ -95,6 +99,12 @@ func NewLogger(format string, level string) zerolog.Logger { NoColor: writer != os.Stdout || format == "text", } } + memoryLogger := zerolog.ConsoleWriter{ + Out: &LogCollector, TimeFormat: "15:04:05.000", + NoColor: true, + } + + writer = zerolog.MultiLevelWriter(writer, memoryLogger) zerolog.TimeFieldFormat = time.RFC3339Nano diff --git a/www/log.html b/www/log.html new file mode 100644 index 00000000..c07994c9 --- /dev/null +++ b/www/log.html @@ -0,0 +1,143 @@ + + + + Logs + + + + + + +
+ + + +
+
+
+ + + \ No newline at end of file diff --git a/www/main.js b/www/main.js index 9ec2fecf..63dbde32 100644 --- a/www/main.js +++ b/www/main.js @@ -47,6 +47,7 @@ nav li {
  • Streams
  • Add
  • Config
    • +
  • Log
    • ` + document.body.innerHTML;