Skip to content

Commit

Permalink
Merge pull request #34 from foodora/no-ticket-change-log-level
Browse files Browse the repository at this point in the history
no-ticket allow change log level
  • Loading branch information
fabioesposito committed Feb 21, 2018
2 parents c495030 + 42cd063 commit e5bdfe0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
1 change: 1 addition & 0 deletions example.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ func init() {
os.Stdout,
ranger_logger.LoggerData{"environment": "development"},
&ranger_logger.JSONFormatter{},
"debug",
logstash,
slack,
)
Expand Down
8 changes: 6 additions & 2 deletions ranger_logger/logrus.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,16 @@ func GetJSONFormatter() *JSONFormatter {
type Formatter logrus.Formatter

//NewLogger - LoggerWrapper constructor that uses the given Formatter and io.Writer like os.Stdout
func NewLogger(out io.Writer, appData LoggerData, f Formatter, hooks ...Hook) LoggerInterface {
func NewLogger(out io.Writer, appData LoggerData, f Formatter, logLevel string, hooks ...Hook) LoggerInterface {
log := logrus.New()

log.Out = out
log.Formatter = f
log.Level = logrus.InfoLevel
level, err := logrus.ParseLevel(logLevel)
if err != nil {
level = logrus.DebugLevel
}
log.Level = level

for _, h := range hooks {
if h != nil {
Expand Down

0 comments on commit e5bdfe0

Please sign in to comment.