Allow configuration of timestamp layout

Signed-off-by: Stephen J Day <stephen.day@docker.com>
This commit is contained in:
Stephen J Day
2015-04-03 17:25:25 -07:00
parent cdd90c38c6
commit e14471f8f2
4 changed files with 28 additions and 10 deletions
+4 -5
View File
@@ -18,9 +18,8 @@ const (
)
var (
baseTimestamp time.Time
isTerminal bool
defaultTimestampFormat = time.RFC3339
baseTimestamp time.Time
isTerminal bool
)
func init() {
@@ -47,7 +46,7 @@ type TextFormatter struct {
// the time passed since beginning of execution.
FullTimestamp bool
// Timestamp format to use for display, if a full timestamp is printed
// TimestampFormat to use for display when a full timestamp is printed
TimestampFormat string
// The fields are sorted by default for a consistent output. For applications
@@ -73,7 +72,7 @@ func (f *TextFormatter) Format(entry *Entry) ([]byte, error) {
isColored := (f.ForceColors || isTerminal) && !f.DisableColors
if f.TimestampFormat == "" {
f.TimestampFormat = defaultTimestampFormat
f.TimestampFormat = DefaultTimestampFormat
}
if isColored {
f.printColored(b, entry, keys)