dropped down log.Errors
Juan Batiz-Benet committed
Jan 26, 2015 at 19:12 UTC
45e4352c9c1afde4c5e61e4c6ce969aa83845715
19 files changed
+42
-43
p2p/net/swarm/swarm_addr.go
+1
-1
@@ -31,7 +31,7 @@ func (s *Swarm) InterfaceListenAddresses() ([]ma.Multiaddr, error) {
31
func checkNATWarning(s *Swarm, observed ma.Multiaddr, expected ma.Multiaddr) {
32
listen, err := s.InterfaceListenAddresses()
33
if err != nil {
34
- log.Errorf("Error retrieving swarm.InterfaceListenAddresses: %s", err)
34
+ log.Debugf("Error retrieving swarm.InterfaceListenAddresses: %s", err)
35
return
36
}
37
p2p/protocol/identify/id.go
+2
-2
@@ -73,7 +73,7 @@ func (ids *IDService) IdentifyConn(c inet.Conn) {
73
74
s, err := c.NewStream()
75
if err != nil {
76
- log.Error("error opening initial stream for %s", ID)
76
+ log.Debugf("error opening initial stream for %s", ID)
77
log.Event(context.TODO(), "IdentifyOpenFailed", c.RemotePeer())
78
} else {
79
@@ -91,7 +91,7 @@ func (ids *IDService) IdentifyConn(c inet.Conn) {
91
ids.currmu.Unlock()
92
93
if !found {
94
- log.Errorf("IdentifyConn failed to find channel (programmer error) for %s", c)
94
+ log.Debugf("IdentifyConn failed to find channel (programmer error) for %s", c)
95
return
96
}
97
p2p/protocol/mux.go
-1
@@ -109,7 +109,6 @@ func (m *Mux) HandleSync(s inet.Stream) {
109
name, handler, err := m.readHeader(s)
110
if err != nil {
111
err = fmt.Errorf("protocol mux error: %s", err)
112
- log.Error(err)
112
log.Event(ctx, "muxError", lgbl.Error(err))
113
s.Close()
114
return
p2p/protocol/relay/relay.go
+1
-1
@@ -46,7 +46,7 @@ func NewRelayService(h host.Host, sh inet.StreamHandler) *RelayService {
46
// requestHandler is the function called by clients
47
func (rs *RelayService) requestHandler(s inet.Stream) {
48
if err := rs.handleStream(s); err != nil {
49
- log.Error("RelayService error:", err)
49
+ log.Debugf("RelayService error:", err)
50
}
51
}
52
repo/config/version.go
+1
-1
@@ -104,7 +104,7 @@ func (s AutoUpdateSetting) String() string {
104
func (v *Version) checkPeriodDuration() time.Duration {
105
d, err := strconv.Atoi(v.CheckPeriod)
106
if err != nil {
107
- log.Error("config.Version.CheckPeriod parse error. Using default.")
107
+ log.Warning("config.Version.CheckPeriod parse error. Using default.")
108
return defaultCheckPeriod
109
}
110
return time.Duration(d)
routing/dht/dht.go
+6
-6
@@ -151,7 +151,7 @@ func (dht *IpfsDHT) putProvider(ctx context.Context, p peer.ID, key string) erro
151
// // only share WAN-friendly addresses ??
152
// pi.Addrs = addrutil.WANShareableAddrs(pi.Addrs)
153
if len(pi.Addrs) < 1 {
154
- log.Errorf("%s putProvider: %s for %s error: no wan-friendly addresses", dht.self, p, u.Key(key), pi.Addrs)
154
+ log.Infof("%s putProvider: %s for %s error: no wan-friendly addresses", dht.self, p, u.Key(key), pi.Addrs)
155
return fmt.Errorf("no known addresses for self. cannot put provider.")
156
}
157
@@ -185,7 +185,7 @@ func (dht *IpfsDHT) getValueOrPeers(ctx context.Context, p peer.ID,
185
// make sure record is valid.
186
err = dht.verifyRecordOnline(ctx, record)
187
if err != nil {
188
- log.Error("Received invalid record!")
188
+ log.Info("Received invalid record! (discarded)")
189
return nil, nil, err
190
}
191
return record.GetValue(), nil, nil
@@ -235,7 +235,7 @@ func (dht *IpfsDHT) getLocal(key u.Key) ([]byte, error) {
235
if u.Debug {
236
err = dht.verifyRecordLocally(rec)
237
if err != nil {
238
- log.Errorf("local record verify failed: %s", err)
238
+ log.Debugf("local record verify failed: %s (discarded)", err)
239
return nil, err
240
}
241
}
@@ -248,7 +248,7 @@ func (dht *IpfsDHT) getLocal(key u.Key) ([]byte, error) {
248
func (dht *IpfsDHT) getOwnPrivateKey() (ci.PrivKey, error) {
249
sk := dht.peerstore.PrivKey(dht.self)
250
if sk == nil {
251
- log.Errorf("%s dht cannot get own private key!", dht.self)
251
+ log.Warningf("%s dht cannot get own private key!", dht.self)
252
return nil, fmt.Errorf("cannot get private key to sign record!")
253
}
254
return sk, nil
@@ -323,7 +323,7 @@ func (dht *IpfsDHT) betterPeersToQuery(pmes *pb.Message, p peer.ID, count int) [
323
// == to self? thats bad
324
for _, p := range closer {
325
if p == dht.self {
326
- log.Error("Attempted to return self! this shouldnt happen...")
326
+ log.Debug("Attempted to return self! this shouldnt happen...")
327
return nil
328
}
329
}
@@ -370,7 +370,7 @@ func (dht *IpfsDHT) PingRoutine(t time.Duration) {
370
ctx, _ := context.WithTimeout(dht.Context(), time.Second*5)
371
_, err := dht.Ping(ctx, p)
372
if err != nil {
373
- log.Errorf("Ping error: %s", err)
373
+ log.Debugf("Ping error: %s", err)
374
}
375
}
376
case <-dht.Closing():
routing/dht/dht_bootstrap.go
+2
-2
@@ -76,7 +76,7 @@ func (dht *IpfsDHT) BootstrapOnSignal(cfg BootstrapConfig, signal <-chan time.Ti
76
77
ctx := dht.Context()
78
if err := dht.runBootstrap(ctx, cfg); err != nil {
79
- log.Error(err)
79
+ log.Warning(err)
80
// A bootstrapping error is important to notice but not fatal.
81
}
82
})
@@ -117,7 +117,7 @@ func (dht *IpfsDHT) runBootstrap(ctx context.Context, cfg BootstrapConfig) error
117
// woah, actually found a peer with that ID? this shouldn't happen normally
118
// (as the ID we use is not a real ID). this is an odd error worth logging.
119
err := fmt.Errorf("Bootstrap peer error: Actually FOUND peer. (%s, %s)", id, p)
120
- log.Errorf("%s", err)
120
+ log.Warningf("%s", err)
121
merr = append(merr, err)
122
}
123
}
routing/dht/dht_net.go
+4
-4
@@ -31,7 +31,7 @@ func (dht *IpfsDHT) handleNewMessage(s inet.Stream) {
31
// receive msg
32
pmes := new(pb.Message)
33
if err := r.ReadMsg(pmes); err != nil {
34
- log.Errorf("Error unmarshaling data: %s", err)
34
+ log.Debugf("Error unmarshaling data: %s", err)
35
return
36
}
37
@@ -41,14 +41,14 @@ func (dht *IpfsDHT) handleNewMessage(s inet.Stream) {
41
// get handler for this msg type.
42
handler := dht.handlerForMsgType(pmes.GetType())
43
if handler == nil {
44
- log.Error("got back nil handler from handlerForMsgType")
44
+ log.Debug("got back nil handler from handlerForMsgType")
45
return
46
}
47
48
// dispatch handler.
49
rpmes, err := handler(ctx, mPeer, pmes)
50
if err != nil {
51
- log.Errorf("handle message error: %s", err)
51
+ log.Debugf("handle message error: %s", err)
52
return
53
}
54
@@ -60,7 +60,7 @@ func (dht *IpfsDHT) handleNewMessage(s inet.Stream) {
60
61
// send out response msg
62
if err := w.WriteMsg(rpmes); err != nil {
63
- log.Errorf("send response error: %s", err)
63
+ log.Debugf("send response error: %s", err)
64
return
65
}
66
routing/dht/dht_test.go
+1
-1
@@ -262,7 +262,7 @@ func waitForWellFormedTables(t *testing.T, dhts []*IpfsDHT, minPeers, avgPeers i
262
for {
263
select {
264
case <-timeoutA:
265
- log.Error("did not reach well-formed routing tables by %s", timeout)
265
+ log.Errorf("did not reach well-formed routing tables by %s", timeout)
266
return false // failed
267
case <-time.After(5 * time.Millisecond):
268
if checkTables() {
routing/dht/handlers.go
+5
-5
@@ -78,7 +78,7 @@ func (dht *IpfsDHT) handleGetValue(ctx context.Context, p peer.ID, pmes *pb.Mess
78
rec := new(pb.Record)
79
err := proto.Unmarshal(byts, rec)
80
if err != nil {
81
- log.Error("Failed to unmarshal dht record from datastore")
81
+ log.Debug("Failed to unmarshal dht record from datastore")
82
return nil, err
83
}
84
@@ -119,7 +119,7 @@ func (dht *IpfsDHT) handlePutValue(ctx context.Context, p peer.ID, pmes *pb.Mess
119
dskey := u.Key(pmes.GetKey()).DsKey()
120
121
if err := dht.verifyRecordLocally(pmes.GetRecord()); err != nil {
122
- log.Errorf("Bad dht record in PUT from: %s. %s", u.Key(pmes.GetRecord().GetAuthor()), err)
122
+ log.Debugf("Bad dht record in PUT from: %s. %s", u.Key(pmes.GetRecord().GetAuthor()), err)
123
return nil, err
124
}
125
@@ -181,7 +181,7 @@ func (dht *IpfsDHT) handleGetProviders(ctx context.Context, p peer.ID, pmes *pb.
181
// check if we have this value, to add ourselves as provider.
182
has, err := dht.datastore.Has(key.DsKey())
183
if err != nil && err != ds.ErrNotFound {
184
- log.Errorf("unexpected datastore error: %v\n", err)
184
+ log.Debugf("unexpected datastore error: %v\n", err)
185
has = false
186
}
187
@@ -226,12 +226,12 @@ func (dht *IpfsDHT) handleAddProvider(ctx context.Context, p peer.ID, pmes *pb.M
226
if pi.ID != p {
227
// we should ignore this provider reccord! not from originator.
228
// (we chould sign them and check signature later...)
229
- log.Errorf("handleAddProvider received provider %s from %s. Ignore.", pi.ID, p)
229
+ log.Debugf("handleAddProvider received provider %s from %s. Ignore.", pi.ID, p)
230
continue
231
}
232
233
if len(pi.Addrs) < 1 {
234
- log.Errorf("%s got no valid addresses for provider %s. Ignore.", dht.self, p)
234
+ log.Debugf("%s got no valid addresses for provider %s. Ignore.", dht.self, p)
235
continue
236
}
237
routing/dht/lookup.go
+1
-1
@@ -51,7 +51,7 @@ func (dht *IpfsDHT) GetClosestPeers(ctx context.Context, key u.Key) (<-chan peer
51
52
closer, err := dht.closerPeersSingle(ctx, key, p)
53
if err != nil {
54
- log.Errorf("error getting closer peers: %s", err)
54
+ log.Debugf("error getting closer peers: %s", err)
55
return nil, err
56
}
57
routing/dht/pb/message.go
+1
-1
@@ -84,7 +84,7 @@ func (m *Message_Peer) Addresses() []ma.Multiaddr {
84
for i, addr := range m.Addrs {
85
maddrs[i], err = ma.NewMultiaddrBytes(addr)
86
if err != nil {
87
- log.Error("error decoding Multiaddr for peer: %s", m.GetId())
87
+ log.Debugf("error decoding Multiaddr for peer: %s", m.GetId())
88
continue
89
}
90
}
routing/dht/records.go
+1
-1
@@ -46,7 +46,7 @@ func (dht *IpfsDHT) getPublicKeyOnline(ctx context.Context, p peer.ID) (ci.PubKe
46
47
pk, err = ci.UnmarshalPublicKey(val)
48
if err != nil {
49
- log.Errorf("Failed to unmarshal public key: %s", err)
49
+ log.Debugf("Failed to unmarshal public key: %s", err)
50
return nil, err
51
}
52
return pk, nil
routing/dht/routing.go
+7
-7
@@ -45,7 +45,7 @@ func (dht *IpfsDHT) PutValue(ctx context.Context, key u.Key, value []byte) error
45
46
rec, err := record.MakePutRecord(sk, key, value)
47
if err != nil {
48
- log.Error("Creation of record failed!")
48
+ log.Debug("Creation of record failed!")
49
return err
50
}
51
@@ -61,7 +61,7 @@ func (dht *IpfsDHT) PutValue(ctx context.Context, key u.Key, value []byte) error
61
defer wg.Done()
62
err := dht.putValueToPeer(ctx, p, key, rec)
63
if err != nil {
64
- log.Errorf("failed putting value to peer: %s", err)
64
+ log.Debugf("failed putting value to peer: %s", err)
65
}
66
}(p)
67
}
@@ -142,7 +142,7 @@ func (dht *IpfsDHT) Provide(ctx context.Context, key u.Key) error {
142
log.Debugf("putProvider(%s, %s)", key, p)
143
err := dht.putProvider(ctx, p, string(key))
144
if err != nil {
145
- log.Error(err)
145
+ log.Debug(err)
146
}
147
}(p)
148
}
@@ -214,7 +214,7 @@ func (dht *IpfsDHT) findProvidersAsyncRoutine(ctx context.Context, key u.Key, co
214
select {
215
case peerOut <- prov:
216
case <-ctx.Done():
217
- log.Error("Context timed out sending more providers")
217
+ log.Debug("Context timed out sending more providers")
218
return nil, ctx.Err()
219
}
220
}
@@ -240,7 +240,7 @@ func (dht *IpfsDHT) findProvidersAsyncRoutine(ctx context.Context, key u.Key, co
240
peers := dht.routingTable.ListPeers()
241
_, err := query.Run(ctx, peers)
242
if err != nil {
243
- log.Errorf("Query error: %s", err)
243
+ log.Debugf("Query error: %s", err)
244
notif.PublishQueryEvent(ctx, ¬if.QueryEvent{
245
Type: notif.QueryError,
246
Extra: err.Error(),
@@ -265,7 +265,7 @@ func (dht *IpfsDHT) FindPeer(ctx context.Context, id peer.ID) (peer.PeerInfo, er
265
// Sanity...
266
for _, p := range peers {
267
if p == id {
268
- log.Error("Found target peer in list of closest peers...")
268
+ log.Debug("Found target peer in list of closest peers...")
269
return dht.peerstore.PeerInfo(p), nil
270
}
271
}
@@ -370,7 +370,7 @@ func (dht *IpfsDHT) FindPeersConnectedToPeer(ctx context.Context, id peer.ID) (<
370
// this does no error checking
371
go func() {
372
if _, err := query.Run(ctx, peers); err != nil {
373
- log.Error(err)
373
+ log.Debug(err)
374
}
375
376
// close the peerchan channel when done.
routing/kbucket/table.go
+1
-1
@@ -135,7 +135,7 @@ func (rt *RoutingTable) NearestPeer(id ID) peer.ID {
135
return peers[0]
136
}
137
138
- log.Errorf("NearestPeer: Returning nil, table size = %d", rt.Size())
138
+ log.Debugf("NearestPeer: Returning nil, table size = %d", rt.Size())
139
return ""
140
}
141
routing/record/validation.go
+3
-3
@@ -34,11 +34,11 @@ func (v Validator) VerifyRecord(r *pb.Record, pk ci.PubKey) error {
34
blob := RecordBlobForSig(r)
35
ok, err := pk.Verify(blob, r.GetSignature())
36
if err != nil {
37
- log.Error("Signature verify failed.")
37
+ log.Info("Signature verify failed. (ignored)")
38
return err
39
}
40
if !ok {
41
- log.Error("dht found a forged record! (ignored)")
41
+ log.Info("dht found a forged record! (ignored)")
42
return ErrBadRecord
43
}
44
@@ -51,7 +51,7 @@ func (v Validator) VerifyRecord(r *pb.Record, pk ci.PubKey) error {
51
52
fnc, ok := v[parts[1]]
53
if !ok {
54
- log.Errorf("Unrecognized key prefix: %s", parts[1])
54
+ log.Infof("Unrecognized key prefix: %s", parts[1])
55
return ErrInvalidRecordType
56
}
57
unixfs/io/dagmodifier.go
+1
-1
@@ -147,7 +147,7 @@ func (dm *DagModifier) WriteAt(b []byte, offset uint64) (int, error) {
147
n := &mdag.Node{Data: ft.WrapData(sb)}
148
_, err := dm.dagserv.Add(n)
149
if err != nil {
150
- log.Errorf("Failed adding node to DAG service: %s", err)
150
+ log.Warningf("Failed adding node to DAG service: %s", err)
151
return 0, err
152
}
153
lnk, err := mdag.MakeLink(n)
updates/updates.go
+3
-3
@@ -158,7 +158,7 @@ func ShouldAutoUpdate(setting config.AutoUpdateSetting, newVer string) bool {
158
159
nv, err := semver.NewVersion(newVer)
160
if err != nil {
161
- log.Errorf("could not parse version string: %s", err)
161
+ log.Infof("could not parse version string: %s", err)
162
return false
163
}
164
@@ -229,7 +229,7 @@ func CliCheckForUpdates(cfg *config.Config, repoPath string) error {
229
230
// if another, unexpected error occurred, note it.
231
if err != nil {
232
- log.Errorf("Error while checking for update: %v", err)
232
+ log.Debugf("Error while checking for update: %v", err)
233
return nil
234
}
235
@@ -242,7 +242,7 @@ func CliCheckForUpdates(cfg *config.Config, repoPath string) error {
242
log.Noticef("Applying update %s", u.Version)
243
244
if err = Apply(u); err != nil {
245
- log.Error(err.Error())
245
+ log.Debug(err)
246
return nil
247
}
248
util/log.go
+1
-1
@@ -56,7 +56,7 @@ func SetupLogging() {
56
var err error
57
lvl, err = logging.LogLevel(logenv)
58
if err != nil {
59
- log.Errorf("logging.LogLevel() Error: %q", err)
59
+ log.Debugf("logging.LogLevel() Error: %q", err)
60
lvl = logging.ERROR // reset to ERROR, could be undefined now(?)
61
}
62
}