Merge branch 'master' of github.com:didip/logrus
diff --git a/hooks/syslog/syslog.go b/hooks/syslog/syslog.go
index 09bb1f4..d7b1343 100644
--- a/hooks/syslog/syslog.go
+++ b/hooks/syslog/syslog.go
@@ -1,17 +1,17 @@
package logrus_syslog
import (
- "os"
"fmt"
- "log/syslog"
"github.com/Sirupsen/logrus"
+ "log/syslog"
+ "os"
)
// SyslogHook to send logs via syslog.
-type SyslogHook struct{
- Writer *syslog.Writer
- SyslogNetwork string
- SyslogRaddr string
+type SyslogHook struct {
+ Writer *syslog.Writer
+ SyslogNetwork string
+ SyslogRaddr string
}
// Creates a hook to be added to an instance of logger. This is called with
@@ -23,14 +23,12 @@
}
func (hook *SyslogHook) Fire(entry *logrus.Entry) error {
- reader, err := entry.Reader()
+ line, err := entry.String()
if err != nil {
fmt.Fprintf(os.Stderr, "Unable to read entry, %v", err)
return err
}
- line := reader.String()
-
switch entry.Data["level"] {
case "panic":
return hook.Writer.Crit(line)
diff --git a/hooks/syslog/syslog_test.go b/hooks/syslog/syslog_test.go
index 87d90df..42762dc 100644
--- a/hooks/syslog/syslog_test.go
+++ b/hooks/syslog/syslog_test.go
@@ -1,14 +1,14 @@
package logrus_syslog
import (
- "testing"
- "log/syslog"
"github.com/Sirupsen/logrus"
+ "log/syslog"
+ "testing"
)
func TestLocalhostAddAndPrint(t *testing.T) {
- log := logrus.New()
- hook, err := NewSyslogHook("udp", "localhost:514", syslog.LOG_INFO, "")
+ log := logrus.New()
+ hook, err := NewSyslogHook("udp", "localhost:514", syslog.LOG_INFO, "")
if err != nil {
t.Errorf("Unable to connect to local syslog.")
@@ -23,4 +23,4 @@
}
log.Info("Congratulations!")
-}
\ No newline at end of file
+}
