From 058bed65b74777c175c75df32cfe0b6df175879d Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sun, 20 Apr 2014 15:38:09 -0400 Subject: [PATCH] Modifying example to allow for both json and text formats and regenerating the non-TTY text output example just in case I converted it wrong. --- README.md | 10 +++++----- examples/text.go | 8 +++++++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 7c8f6d8..90cdb79 100644 --- a/README.md +++ b/README.md @@ -33,11 +33,11 @@ is not attached, the output is compatible with the [l2met](http://r.32k.io/l2met-introduction) format: ```text -time="2014-03-14 13:00:31.751756799 -0400 EDT" level="info" msg="A group of walrus emerges from the ocean" animal="walrus" size=10 -time="2014-03-14 13:00:31.751994265 -0400 EDT" level="warning" msg="The group's number increased tremendously!" omg=true number=122 -time="2014-03-14 13:00:31.752018319 -0400 EDT" level="info" msg="A giant walrus appears!" animal="walrus" size=10 -time="2014-03-14 13:00:31.752034139 -0400 EDT" level="info" msg="Tremendously sized cow enters the ocean." animal="walrus" size=9 -time="2014-03-14 13:00:31.752048504 -0400 EDT" level="fatal" msg="The ice breaks!" omg=true number=100 +time="2014-04-20 15:36:23.830442383 -0400 EDT" level="info" msg="A group of walrus emerges from the ocean" animal="walrus" size=10 +time="2014-04-20 15:36:23.830584199 -0400 EDT" level="warning" msg="The group's number increased tremendously!" omg=true number=122 +time="2014-04-20 15:36:23.830596521 -0400 EDT" level="info" msg="A giant walrus appears!" animal="walrus" size=10 +time="2014-04-20 15:36:23.830611837 -0400 EDT" level="info" msg="Tremendously sized cow enters the ocean." animal="walrus" size=9 +time="2014-04-20 15:36:23.830626464 -0400 EDT" level="fatal" msg="The ice breaks!" omg=true number=100 ``` #### Example diff --git a/examples/text.go b/examples/text.go index b96f833..cc4bfec 100644 --- a/examples/text.go +++ b/examples/text.go @@ -1,12 +1,18 @@ package main import ( + "os" + "github.com/Sirupsen/logrus" ) func main() { log := logrus.New() - log.Formatter = new(logrus.JSONFormatter) + if os.Getenv("LOG_FORMAT") == "json" { + log.Formatter = new(logrus.JSONFormatter) + } else { + log.Formatter = new(logrus.TextFormatter) + } for { log.WithFields(logrus.Fields{