Update logrus

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
This commit is contained in:
Ben Firshman 2014-12-10 09:09:54 -08:00
parent 24574d513a
commit e0b18fee7d
4 changed files with 22 additions and 10 deletions

4
Godeps/Godeps.json generated
View File

@ -14,8 +14,8 @@
},
{
"ImportPath": "github.com/Sirupsen/logrus",
"Comment": "v0.6.0-5-gf92b795",
"Rev": "f92b7950b372b1db80bd3527e4d40e42555fe6c2"
"Comment": "v0.6.1",
"Rev": "1f2ba2c6317323dd667bd266c1e8ebffc4a4c62f"
},
{
"ImportPath": "github.com/digitalocean/godo",

View File

@ -206,11 +206,18 @@ import (
log "github.com/Sirupsen/logrus"
"github.com/Sirupsen/logrus/hooks/airbrake"
"github.com/Sirupsen/logrus/hooks/syslog"
"log/syslog"
)
func init() {
log.AddHook(new(logrus_airbrake.AirbrakeHook))
log.AddHook(logrus_syslog.NewSyslogHook("udp", "localhost:514", syslog.LOG_INFO, ""))
hook, err := logrus_syslog.NewSyslogHook("udp", "localhost:514", syslog.LOG_INFO, "")
if err != nil {
log.Error("Unable to connect to local syslog daemon")
} else {
log.AddHook(hook)
}
}
```

View File

@ -30,6 +30,11 @@ func SetLevel(level Level) {
std.Level = level
}
// GetLevel returns the standard logger level.
func GetLevel() Level {
return std.Level
}
// AddHook adds a hook to the standard logger hooks.
func AddHook(hook Hook) {
std.mu.Lock()

View File

@ -29,18 +29,18 @@ func (hook *SyslogHook) Fire(entry *logrus.Entry) error {
return err
}
switch entry.Data["level"] {
case "panic":
switch entry.Level {
case logrus.PanicLevel:
return hook.Writer.Crit(line)
case "fatal":
case logrus.FatalLevel:
return hook.Writer.Crit(line)
case "error":
case logrus.ErrorLevel:
return hook.Writer.Err(line)
case "warn":
case logrus.WarnLevel:
return hook.Writer.Warning(line)
case "info":
case logrus.InfoLevel:
return hook.Writer.Info(line)
case "debug":
case logrus.DebugLevel:
return hook.Writer.Debug(line)
default:
return nil