Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions console.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ func NewConsoleLogger(conf Config) (Logger, error) {
}

func (l *consoleLogger) FormatMessage(sev Severity, caller *CallerInfo, format string, args ...interface{}) string {
return fmt.Sprintf("%v %s %s PID:%d [%s:%d:%s] %s\n",
time.Now().UTC().Format(time.StampMilli), appname, sev, pid, caller.FileName, caller.LineNo, caller.FuncName, fmt.Sprintf(format, args...))
return fmt.Sprintf("%v %s: %s\n",
time.Now().UTC().Format(time.StampMilli), sev, fmt.Sprintf(format, args...))
}
4 changes: 2 additions & 2 deletions log_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ func (s *LogSuite) TestCallerInfo(c *C) {
logFunc("blah")
// Then
c.Assert(l.b.String(), Equals, fmt.Sprintf(
"%s log_test.go[138] github.com/mailgun/log.(*LogSuite).TestCallerInfo", severity))
"%s log_test.go[138] github.com/stoplightio/log.(*LogSuite).TestCallerInfo", severity))
}
}

Expand All @@ -149,7 +149,7 @@ func (s *LogSuite) TestCallerInfoLogfmt(c *C) {
// When
Logfmt(0, SeverityInfo, "blah")
// Then
c.Assert(l.b.String(), Equals, "INFO log_test.go[150] github.com/mailgun/log.(*LogSuite).TestCallerInfoLogfmt")
c.Assert(l.b.String(), Equals, "INFO log_test.go[150] github.com/stoplightio/log.(*LogSuite).TestCallerInfoLogfmt")
}

type callerLogger struct {
Expand Down
4 changes: 3 additions & 1 deletion syslog.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// +build !windows

package log

import (
Expand Down Expand Up @@ -72,5 +74,5 @@ func (l *sysLogger) Writer(sev Severity) io.Writer {
}

func (l *sysLogger) FormatMessage(sev Severity, caller *CallerInfo, format string, args ...interface{}) string {
return fmt.Sprintf("%s [%s:%d] %s", sev, caller.FileName, caller.LineNo, fmt.Sprintf(format, args...))
return fmt.Sprintf("%s: %s", sev, fmt.Sprintf(format, args...))
}
28 changes: 28 additions & 0 deletions syslog_windows.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// This file stubs out the sysLogger for windows, since
// syslog is not implemented for windows yet.
package log

import "io"

type sysLogger struct {
}

func NewSysLogger(conf Config) (Logger, error) {
return &sysLogger{}, nil
}

func (l *sysLogger) SetSeverity(sev Severity) {
}

func (l *sysLogger) GetSeverity() Severity {
//LOG_INFO
return 6
}

func (l *sysLogger) Writer(sev Severity) io.Writer {
return nil
}

func (l *sysLogger) FormatMessage(sev Severity, caller *CallerInfo, format string, args ...interface{}) string {
return ""
}