mirror of
https://github.com/Luzifer/elb-instance-status.git
synced 2024-12-22 19:01:19 +00:00
Merge branch 'logging#5'
This commit is contained in:
commit
856bc8ed07
3 changed files with 91 additions and 2 deletions
8
main.go
8
main.go
|
@ -138,9 +138,9 @@ func executeAndRegisterCheck(ctx context.Context, checkID string) {
|
|||
start := time.Now()
|
||||
|
||||
cmd := exec.Command("/bin/bash", "-e", "-o", "pipefail", "-c", check.Command)
|
||||
cmd.Stderr = os.Stderr
|
||||
cmd.Stderr = newPrefixedLogger(os.Stderr, checkID+":STDERR")
|
||||
if cfg.Verbose {
|
||||
cmd.Stdout = os.Stdout
|
||||
cmd.Stdout = newPrefixedLogger(os.Stderr, checkID+":STDOUT")
|
||||
}
|
||||
err := cmd.Start()
|
||||
|
||||
|
@ -177,6 +177,10 @@ func executeAndRegisterCheck(ctx context.Context, checkID string) {
|
|||
checkResults[checkID].Streak = 1
|
||||
}
|
||||
|
||||
if !success {
|
||||
log.Printf("Check %q failed, streak now at %d, error was: %s", checkID, checkResults[checkID].Streak, err)
|
||||
}
|
||||
|
||||
lastResultRegistered = time.Now()
|
||||
|
||||
if success {
|
||||
|
|
51
prefixed_logger.go
Normal file
51
prefixed_logger.go
Normal file
|
@ -0,0 +1,51 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"fmt"
|
||||
"io"
|
||||
"sync"
|
||||
)
|
||||
|
||||
type prefixedLogger struct {
|
||||
channel string
|
||||
wrappedWriter io.Writer
|
||||
|
||||
buffer []byte
|
||||
bufferLock sync.Mutex
|
||||
}
|
||||
|
||||
func newPrefixedLogger(wrappedWriter io.Writer, channel string) *prefixedLogger {
|
||||
return &prefixedLogger{
|
||||
channel: channel,
|
||||
wrappedWriter: wrappedWriter,
|
||||
buffer: []byte{},
|
||||
}
|
||||
}
|
||||
|
||||
func (p *prefixedLogger) dropCR(data []byte) []byte {
|
||||
if len(data) > 0 && data[len(data)-1] == '\r' {
|
||||
return data[0 : len(data)-1]
|
||||
}
|
||||
return data
|
||||
}
|
||||
|
||||
func (p *prefixedLogger) Write(in []byte) (n int, err error) {
|
||||
p.bufferLock.Lock()
|
||||
defer p.bufferLock.Unlock()
|
||||
|
||||
n = len(in)
|
||||
p.buffer = append(p.buffer, in...)
|
||||
|
||||
for {
|
||||
if i := bytes.IndexByte(p.buffer, '\n'); i >= 0 {
|
||||
// We have a full newline-terminated line.
|
||||
fmt.Fprintf(p.wrappedWriter, "[%s] %s\n", p.channel, string(p.dropCR(p.buffer[0:i])))
|
||||
p.buffer = p.buffer[i+1 : len(p.buffer)]
|
||||
} else {
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
return
|
||||
}
|
34
prefixed_logger_test.go
Normal file
34
prefixed_logger_test.go
Normal file
|
@ -0,0 +1,34 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestPrefixedLogger(t *testing.T) {
|
||||
var (
|
||||
buf = bytes.NewBuffer([]byte{})
|
||||
pl = newPrefixedLogger(buf, "baum")
|
||||
n int
|
||||
err error
|
||||
)
|
||||
|
||||
n, err = pl.Write([]byte("non-newline terminated string"))
|
||||
if n != 29 || err != nil {
|
||||
t.Fatalf("Write to prefixedLogger had unexpected results: n=29 != %d, err=nil != %s", n, err)
|
||||
}
|
||||
|
||||
if n = len(buf.Bytes()); n != 0 {
|
||||
t.Fatalf("Buffer contains %d characters, should contain 0", n)
|
||||
}
|
||||
|
||||
pl.Write([]byte("now a newline\nand something"))
|
||||
if n = len(buf.Bytes()); n != 50 {
|
||||
t.Fatalf("Buffer contains %d characters, should contain 50", n)
|
||||
}
|
||||
|
||||
pl.Write([]byte(" more to log\nwith multiple\nnewlines\n"))
|
||||
if n = len(buf.Bytes()); n != 120 {
|
||||
t.Fatalf("Buffer contains %d characters, should contain 120", n)
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue