9892ab0af7
Added --since argument to `docker logs` command. Accept unix timestamps and shows logs only created after the specified date. Default value is 0 and passing default value or not specifying the value in the request causes parameter to be ignored (behavior prior to this change). Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
57 lines
1.1 KiB
Go
57 lines
1.1 KiB
Go
package jsonlog
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"io"
|
|
"time"
|
|
|
|
"github.com/Sirupsen/logrus"
|
|
)
|
|
|
|
type JSONLog struct {
|
|
Log string `json:"log,omitempty"`
|
|
Stream string `json:"stream,omitempty"`
|
|
Created time.Time `json:"time"`
|
|
}
|
|
|
|
func (jl *JSONLog) Format(format string) (string, error) {
|
|
if format == "" {
|
|
return jl.Log, nil
|
|
}
|
|
if format == "json" {
|
|
m, err := json.Marshal(jl)
|
|
return string(m), err
|
|
}
|
|
return fmt.Sprintf("%s %s", jl.Created.Format(format), jl.Log), nil
|
|
}
|
|
|
|
func (jl *JSONLog) Reset() {
|
|
jl.Log = ""
|
|
jl.Stream = ""
|
|
jl.Created = time.Time{}
|
|
}
|
|
|
|
func WriteLog(src io.Reader, dst io.Writer, format string, since time.Time) error {
|
|
dec := json.NewDecoder(src)
|
|
l := &JSONLog{}
|
|
for {
|
|
l.Reset()
|
|
if err := dec.Decode(l); err == io.EOF {
|
|
return nil
|
|
} else if err != nil {
|
|
logrus.Printf("Error streaming logs: %s", err)
|
|
return err
|
|
}
|
|
if !since.IsZero() && l.Created.Before(since) {
|
|
continue
|
|
}
|
|
line, err := l.Format(format)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if _, err := io.WriteString(dst, line); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
}
|