Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion client.go
Original file line number Diff line number Diff line change
Expand Up @@ -1167,6 +1167,8 @@ func (c *Client) logStderr(name string, r io.Reader) {
reader := bufio.NewReaderSize(r, c.config.PluginLogBufferSize)
// continuation indicates the previous line was a prefix
continuation := false
// panic indicates the previous line was the start of a panic output
panic := false

for {
line, isPrefix, err := reader.ReadLine()
Expand Down Expand Up @@ -1203,19 +1205,32 @@ func (c *Client) logStderr(name string, r io.Reader) {
// string prefixes
switch line := string(line); {
case strings.HasPrefix(line, "[TRACE]"):
panic = false
l.Trace(line)
case strings.HasPrefix(line, "[DEBUG]"):
panic = false
l.Debug(line)
case strings.HasPrefix(line, "[INFO]"):
panic = false
l.Info(line)
case strings.HasPrefix(line, "[WARN]"):
panic = false
l.Warn(line)
case strings.HasPrefix(line, "[ERROR]"):
panic = false
l.Error(line)
case strings.HasPrefix(line, "panic:"):
panic = true
l.Error(line)
default:
l.Debug(line)
if panic {
l.Error(line)
} else {
l.Debug(line)
}
}
} else {
panic = false
out := flattenKVPairs(entry.KVPairs)

out = append(out, "timestamp", entry.Timestamp.Format(hclog.TimeFormat))
Expand Down