remove prefix logger
Brian Tiger Chow committed
Jan 24, 2015 at 00:24 UTC
6fedf259eb6561e6b49562d432213a4b71bf5b4f
10 files changed
+26
-68
core/corehttp/gateway_handler.go
-1
@@ -82,7 +82,6 @@ func (i *gatewayHandler) NewDagReader(nd *dag.Node) (io.Reader, error) {
82
83
func (i *gatewayHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
84
path := r.URL.Path[5:]
85
- log := log.Prefix("serving %s", path)
85
86
nd, err := i.ResolvePath(path)
87
if err != nil {
exchange/bitswap/bitswap.go
-12
@@ -173,10 +173,6 @@ func (bs *bitswap) sendWantlistMsgToPeers(ctx context.Context, m bsmsg.BitSwapMe
173
panic("Cant send wantlist to nil peerchan")
174
}
175
176
- log := log.Prefix("bitswap(%s).sendWantlistMsgToPeers(%d)", bs.self, len(m.Wantlist()))
177
- log.Debugf("begin")
178
- defer log.Debugf("end")
179
-
176
set := pset.New()
177
wg := sync.WaitGroup{}
178
for peerToQuery := range peers {
@@ -216,10 +212,6 @@ func (bs *bitswap) sendWantlistToProviders(ctx context.Context) {
212
return
213
}
214
219
- log := log.Prefix("bitswap(%s).sendWantlistToProviders ", bs.self)
220
- log.Debugf("begin")
221
- defer log.Debugf("end")
222
-
215
ctx, cancel := context.WithCancel(ctx)
216
defer cancel()
217
@@ -233,9 +225,6 @@ func (bs *bitswap) sendWantlistToProviders(ctx context.Context) {
225
go func(k u.Key) {
226
defer wg.Done()
227
236
- log := log.Prefix("(entry: %s) ", k)
237
- log.Debug("asking dht for providers")
238
-
228
child, _ := context.WithTimeout(ctx, providerRequestTimeout)
229
providers := bs.network.FindProvidersAsync(child, k, maxProvidersPerRequest)
230
for prov := range providers {
@@ -257,7 +246,6 @@ func (bs *bitswap) sendWantlistToProviders(ctx context.Context) {
246
}
247
248
func (bs *bitswap) taskWorker(ctx context.Context) {
260
- log := log.Prefix("bitswap(%s).taskWorker", bs.self)
249
for {
250
select {
251
case <-ctx.Done():
exchange/bitswap/decision/engine.go
-4
@@ -163,10 +163,6 @@ func (e *Engine) MessageReceived(p peer.ID, m bsmsg.BitSwapMessage) error {
163
e.lock.Lock()
164
defer e.lock.Unlock()
165
166
- log := log.Prefix("bitswap.Engine.MessageReceived(%s)", p)
167
- log.Debugf("enter. %d entries %d blocks", len(m.Wantlist()), len(m.Blocks()))
168
- defer log.Debugf("exit")
169
-
166
if len(m.Wantlist()) == 0 && len(m.Blocks()) == 0 {
167
log.Info("superfluous message")
168
}
exchange/bitswap/network/ipfs_impl.go
-11
@@ -39,28 +39,23 @@ func (bsnet *impl) SendMessage(
39
p peer.ID,
40
outgoing bsmsg.BitSwapMessage) error {
41
42
- log := log.Prefix("bitswap net SendMessage to %s", p)
43
-
42
// ensure we're connected
43
//TODO(jbenet) move this into host.NewStream?
44
if err := bsnet.host.Connect(ctx, peer.PeerInfo{ID: p}); err != nil {
45
return err
46
}
47
50
- log.Debug("opening stream")
48
s, err := bsnet.host.NewStream(ProtocolBitswap, p)
49
if err != nil {
50
return err
51
}
52
defer s.Close()
53
57
- log.Debug("sending")
54
if err := outgoing.ToNet(s); err != nil {
55
log.Errorf("error: %s", err)
56
return err
57
}
58
63
- log.Debug("sent")
59
return err
60
}
61
@@ -69,35 +64,29 @@ func (bsnet *impl) SendRequest(
64
p peer.ID,
65
outgoing bsmsg.BitSwapMessage) (bsmsg.BitSwapMessage, error) {
66
72
- log := log.Prefix("bitswap net SendRequest to %s", p)
73
-
67
// ensure we're connected
68
//TODO(jbenet) move this into host.NewStream?
69
if err := bsnet.host.Connect(ctx, peer.PeerInfo{ID: p}); err != nil {
70
return nil, err
71
}
72
80
- log.Debug("opening stream")
73
s, err := bsnet.host.NewStream(ProtocolBitswap, p)
74
if err != nil {
75
return nil, err
76
}
77
defer s.Close()
78
87
- log.Debug("sending")
79
if err := outgoing.ToNet(s); err != nil {
80
log.Errorf("error: %s", err)
81
return nil, err
82
}
83
93
- log.Debug("sent, now receiveing")
84
incoming, err := bsmsg.FromNet(s)
85
if err != nil {
86
log.Errorf("error: %s", err)
87
return incoming, err
88
}
89
100
- log.Debug("received")
90
return incoming, nil
91
}
92
p2p/net/swarm/swarm_dial.go
-1
@@ -179,7 +179,6 @@ func (db *dialbackoff) Clear(p peer.ID) {
179
// This allows us to use various transport protocols, do NAT traversal/relay,
180
// etc. to achive connection.
181
func (s *Swarm) Dial(ctx context.Context, p peer.ID) (*Conn, error) {
182
- log := log.Prefix("swarm %s dialing %s", s.local, p)
182
if p == s.local {
183
return nil, errors.New("Attempted connection to self!")
184
}
p2p/peer/queue/sync.go
-2
@@ -24,8 +24,6 @@ func NewChanQueue(ctx context.Context, pq PeerQueue) *ChanQueue {
24
}
25
26
func (cq *ChanQueue) process(ctx context.Context) {
27
- log := log.Prefix("<ChanQueue %p>", cq)
28
-
27
// construct the channels here to be able to use them bidirectionally
28
enqChan := make(chan peer.ID)
29
deqChan := make(chan peer.ID)
routing/dht/dht.go
+1
-1
@@ -97,7 +97,7 @@ func (dht *IpfsDHT) LocalPeer() peer.ID {
97
98
// log returns the dht's logger
99
func (dht *IpfsDHT) log() eventlog.EventLogger {
100
- return log.Prefix("dht(%s)", dht.self)
100
+ return log // TODO rm
101
}
102
103
// Connect to a new peer at the given address, ping and add to the routing table
routing/dht/query.go
-9
@@ -84,7 +84,6 @@ func newQueryRunner(ctx context.Context, q *dhtQuery) *dhtQueryRunner {
84
}
85
86
func (r *dhtQueryRunner) Run(peers []peer.ID) (*dhtQueryResult, error) {
87
- log := log.Prefix("dht(%s).Query(%s).Run(%d)", r.query.dht.self, r.query.key, len(peers))
87
r.log = log
88
log.Debug("enter")
89
defer log.Debug("end")
@@ -169,10 +168,6 @@ func (r *dhtQueryRunner) addPeerToQuery(ctx context.Context, next peer.ID) {
168
}
169
170
func (r *dhtQueryRunner) spawnWorkers(parent ctxgroup.ContextGroup) {
172
- log := r.log.Prefix("spawnWorkers")
173
- log.Debugf("begin")
174
- defer log.Debugf("end")
175
-
171
for {
172
173
select {
@@ -198,10 +193,6 @@ func (r *dhtQueryRunner) spawnWorkers(parent ctxgroup.ContextGroup) {
193
}
194
195
func (r *dhtQueryRunner) queryPeer(cg ctxgroup.ContextGroup, p peer.ID) {
201
- log := r.log.Prefix("queryPeer(%s)", p)
202
- log.Debugf("spawned")
203
- defer log.Debugf("finished")
204
-
196
// make sure we rate limit concurrency.
197
select {
198
case <-r.rateLimit:
routing/dht/routing.go
-12
@@ -73,10 +73,6 @@ func (dht *IpfsDHT) PutValue(ctx context.Context, key u.Key, value []byte) error
73
// If the search does not succeed, a multiaddr string of a closer peer is
74
// returned along with util.ErrSearchIncomplete
75
func (dht *IpfsDHT) GetValue(ctx context.Context, key u.Key) ([]byte, error) {
76
- log := dht.log().Prefix("GetValue(%s)", key)
77
- log.Debugf("start")
78
- defer log.Debugf("end")
79
-
76
// If we have it local, dont bother doing an RPC!
77
val, err := dht.getLocal(key)
78
if err == nil {
@@ -128,8 +124,6 @@ func (dht *IpfsDHT) GetValue(ctx context.Context, key u.Key) ([]byte, error) {
124
125
// Provide makes this node announce that it can provide a value for the given key
126
func (dht *IpfsDHT) Provide(ctx context.Context, key u.Key) error {
131
- log := dht.log().Prefix("Provide(%s)", key)
132
-
127
defer log.EventBegin(ctx, "provide", &key).Done()
128
129
// add self locally
@@ -176,8 +170,6 @@ func (dht *IpfsDHT) FindProvidersAsync(ctx context.Context, key u.Key, count int
170
}
171
172
func (dht *IpfsDHT) findProvidersAsyncRoutine(ctx context.Context, key u.Key, count int, peerOut chan peer.PeerInfo) {
179
- log := dht.log().Prefix("FindProviders(%s)", key)
180
-
173
defer log.EventBegin(ctx, "findProvidersAsync", &key).Done()
174
defer close(peerOut)
175
@@ -201,10 +193,6 @@ func (dht *IpfsDHT) findProvidersAsyncRoutine(ctx context.Context, key u.Key, co
193
194
// setup the Query
195
query := dht.newQuery(key, func(ctx context.Context, p peer.ID) (*dhtQueryResult, error) {
204
- log := log.Prefix("Query(%s)", p)
205
- log.Debugf("begin")
206
- defer log.Debugf("end")
207
-
196
pmes, err := dht.findProvidersSingle(ctx, p, key)
197
if err != nil {
198
return nil, err
thirdparty/eventlog/log.go
+25
-15
@@ -6,19 +6,34 @@ import (
6
"time"
7
8
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
9
-
10
- prelog "github.com/jbenet/go-ipfs/util/prefixlog"
9
+ "github.com/jbenet/go-ipfs/util" // TODO remove IPFS dependency
10
)
11
12
+// StandardLogger provides API compatibility with standard printf loggers
13
+// eg. go-logging
14
+type StandardLogger interface {
15
+ Critical(args ...interface{})
16
+ Criticalf(format string, args ...interface{})
17
+ Debug(args ...interface{})
18
+ Debugf(format string, args ...interface{})
19
+ Error(args ...interface{})
20
+ Errorf(format string, args ...interface{})
21
+ Fatal(args ...interface{})
22
+ Fatalf(format string, args ...interface{})
23
+ Info(args ...interface{})
24
+ Infof(format string, args ...interface{})
25
+ Notice(args ...interface{})
26
+ Noticef(format string, args ...interface{})
27
+ Panic(args ...interface{})
28
+ Panicf(format string, args ...interface{})
29
+ Warning(args ...interface{})
30
+ Warningf(format string, args ...interface{})
31
+}
32
+
33
// EventLogger extends the StandardLogger interface to allow for log items
34
// containing structured metadata
35
type EventLogger interface {
16
- prelog.StandardLogger
17
-
18
- // Prefix is like PrefixLogger.Prefix. We override it here
19
- // because the type changes (we return EventLogger).
20
- // It's what happens when you wrap interfaces.
21
- Prefix(fmt string, args ...interface{}) EventLogger
36
+ StandardLogger
37
38
// Event merges structured data from the provided inputs into a single
39
// machine-readable log event.
@@ -50,22 +65,17 @@ func Logger(system string) EventLogger {
65
66
// TODO if we would like to adjust log levels at run-time. Store this event
67
// logger in a map (just like the util.Logger impl)
53
- return &eventLogger{system: system, PrefixLogger: prelog.Logger(system)}
68
+ return &eventLogger{system: system, StandardLogger: util.Logger(system)}
69
}
70
71
// eventLogger implements the EventLogger and wraps a go-logging Logger
72
type eventLogger struct {
58
- prelog.PrefixLogger
73
+ StandardLogger
74
75
system string
76
// TODO add log-level
77
}
78
64
-func (el *eventLogger) Prefix(fmt string, args ...interface{}) EventLogger {
65
- l := el.PrefixLogger.Prefix(fmt, args...)
66
- return &eventLogger{system: el.system, PrefixLogger: l}
67
-}
68
-
79
func (el *eventLogger) EventBegin(ctx context.Context, event string, metadata ...Loggable) DoneCloser {
80
start := time.Now()
81
el.Event(ctx, fmt.Sprintln(event, "Begin"), metadata...)