opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-26 15:42:21 +08:00
Code Issues Projects Releases Wiki Activity

feat(eventlog) add support for e := log.Begin... e.Append(Loggable)

Browse Source
This commit is contained in:
Brian Tiger Chow
2015-01-29 00:38:08 -08:00
parent 88fa7388de
commit 8f16a4efff
1 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
thirdparty/eventlog/log.go vendored
View File

@ -2,7 +2,6 @@ package eventlog
import ( import (
"fmt" "fmt"
"io"
"time" "time"
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
@ -50,14 +49,7 @@ type EventLogger interface {
// the metadata is logged. // the metadata is logged.
Event(ctx context.Context, event string, m ...Loggable) Event(ctx context.Context, event string, m ...Loggable)
EventBegin(ctx context.Context, event string, m ...Loggable) DoneCloser EventBegin(ctx context.Context, event string, m ...Loggable) EventInProgress
}
type DoneCloser interface {
// Done ends the event
Done()
// io.Closer is a convenience-alias for Done
io.Closer
} }
// Logger retrieves an event logger by name // Logger retrieves an event logger by name
@ -76,14 +68,21 @@ type eventLogger struct {
// TODO add log-level // TODO add log-level
} }
func (el *eventLogger) EventBegin(ctx context.Context, event string, metadata ...Loggable) DoneCloser { func (el *eventLogger) EventBegin(ctx context.Context, event string, metadata ...Loggable) EventInProgress {
start := time.Now() start := time.Now()
el.Event(ctx, fmt.Sprintf("%sBegin", event), metadata...) el.Event(ctx, fmt.Sprintf("%sBegin", event), metadata...)
return doneCloserFunc(func() {
el.Event(ctx, event, append(metadata, LoggableMap(map[string]interface{}{ eip := EventInProgress{}
eip.doneFunc = func(additional []Loggable) {
metadata = append(metadata, additional...) // anything added during the operation
metadata = append(metadata, LoggableMap(map[string]interface{}{ // finally, duration of event
"duration": time.Now().Sub(start), "duration": time.Now().Sub(start),
}))...) }))
})
el.Event(ctx, event, metadata...)
}
return eip
} }
func (el *eventLogger) Event(ctx context.Context, event string, metadata ...Loggable) { func (el *eventLogger) Event(ctx context.Context, event string, metadata ...Loggable) {
@ -111,13 +110,24 @@ func (el *eventLogger) Event(ctx context.Context, event string, metadata ...Logg
e.Log() // TODO replace this when leveled-logs have been implemented e.Log() // TODO replace this when leveled-logs have been implemented
} }
type doneCloserFunc func() type EventInProgress struct {
loggables []Loggable
func (f doneCloserFunc) Done() { doneFunc func([]Loggable)
f()
} }
func (f doneCloserFunc) Close() error { // Append adds loggables to be included in the call to Done
f.Done() func (eip EventInProgress) Append(l Loggable) {
eip.loggables = append(eip.loggables, l)
}
// Done creates a new Event entry that includes the duration and appended
// loggables.
func (eip EventInProgress) Done() {
eip.doneFunc(eip.loggables) // create final event with extra data
}
// Close is an alias for done
func (eip EventInProgress) Close() error {
eip.Done()
return nil return nil
} }