Skip to content

Make Record.Args public so can be accessed by backends #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 6, 2016
Merged

Make Record.Args public so can be accessed by backends #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion format.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,8 @@ func NewStringFormatter(format string) (Formatter, error) {
Id: 12345,
Time: t,
Module: "logger",
Args: []interface{}{"go"},
fmt: "hello %s",
args: []interface{}{"go"},
}
if err := fmter.Format(0, r, &bytes.Buffer{}); err != nil {
return nil, err
Expand Down
10 changes: 5 additions & 5 deletions logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ type Record struct {
Time time.Time
Module string
Level Level
Args []interface{}

// message is kept as a pointer to have shallow copies update this once
// needed.
message *string
args []interface{}
fmt string
formatter Formatter
formatted string
Expand All @@ -69,12 +69,12 @@ func (r *Record) Formatted(calldepth int) string {
func (r *Record) Message() string {
if r.message == nil {
// Redact the arguments that implements the Redactor interface
for i, arg := range r.args {
for i, arg := range r.Args {
if redactor, ok := arg.(Redactor); ok == true {
r.args[i] = redactor.Redacted()
r.Args[i] = redactor.Redacted()
}
}
msg := fmt.Sprintf(r.fmt, r.args...)
msg := fmt.Sprintf(r.fmt, r.Args...)
r.message = &msg
}
return *r.message
Expand Down Expand Up @@ -144,7 +144,7 @@ func (l *Logger) log(lvl Level, format string, args ...interface{}) {
Module: l.Module,
Level: lvl,
fmt: format,
args: args,
Args: args,
}

// TODO use channels to fan out the records to all backends?
Expand Down