0026788d4b
* Correct handling of "unspecified" log level * Setting log-format default on monitor path * Create changelog file * Update website/content/api-docs/system/monitor.mdx Co-authored-by: Chris Capurso <1036769+ccapurso@users.noreply.github.com> Co-authored-by: Chris Capurso <1036769+ccapurso@users.noreply.github.com>
74 lines
1.3 KiB
Go
74 lines
1.3 KiB
Go
package api
|
|
|
|
import (
|
|
"bufio"
|
|
"context"
|
|
"fmt"
|
|
"net/http"
|
|
|
|
"github.com/hashicorp/vault/sdk/helper/logging"
|
|
)
|
|
|
|
// Monitor returns a channel that outputs strings containing the log messages
|
|
// coming from the server.
|
|
func (c *Sys) Monitor(ctx context.Context, logLevel string, logFormat string) (chan string, error) {
|
|
r := c.c.NewRequest(http.MethodGet, "/v1/sys/monitor")
|
|
|
|
if logLevel == "" {
|
|
r.Params.Add("log_level", "info")
|
|
} else {
|
|
r.Params.Add("log_level", logLevel)
|
|
}
|
|
|
|
if logFormat == "" || logFormat == logging.UnspecifiedFormat.String() {
|
|
r.Params.Add("log_format", "standard")
|
|
} else {
|
|
r.Params.Add("log_format", logFormat)
|
|
}
|
|
|
|
resp, err := c.c.RawRequestWithContext(ctx, r)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
logCh := make(chan string, 64)
|
|
|
|
go func() {
|
|
scanner := bufio.NewScanner(resp.Body)
|
|
droppedCount := 0
|
|
|
|
defer close(logCh)
|
|
defer resp.Body.Close()
|
|
|
|
for {
|
|
if ctx.Err() != nil {
|
|
return
|
|
}
|
|
|
|
if !scanner.Scan() {
|
|
return
|
|
}
|
|
|
|
logMessage := scanner.Text()
|
|
|
|
if droppedCount > 0 {
|
|
select {
|
|
case logCh <- fmt.Sprintf("Monitor dropped %d logs during monitor request\n", droppedCount):
|
|
droppedCount = 0
|
|
default:
|
|
droppedCount++
|
|
continue
|
|
}
|
|
}
|
|
|
|
select {
|
|
case logCh <- logMessage:
|
|
default:
|
|
droppedCount++
|
|
}
|
|
}
|
|
}()
|
|
|
|
return logCh, nil
|
|
}
|