Skip to content

Commit 1d60251

Browse files
terencechainterencechain
authored
fix: srv log error (#424)
1 parent 2ab4a80 commit 1d60251

File tree

5 files changed

+37
-33
lines changed

5 files changed

+37
-33
lines changed

‎assertions/poster.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ func NewPoster(
4040

4141
func (p *Poster) Start(ctx context.Context) {
4242
if _, err := p.PostAssertion(ctx); err != nil {
43-
srvlog.Error("Could not submit latest assertion to L1", err)
43+
srvlog.Error("Could not submit latest assertion to L1", log.Ctx{"err": err})
4444
}
4545
ticker := time.NewTicker(p.postInterval)
4646
defer ticker.Stop()
4747
for {
4848
select {
4949
case <-ticker.C:
5050
if _, err := p.PostAssertion(ctx); err != nil {
51-
srvlog.Error("Could not submit latest assertion to L1", err)
51+
srvlog.Error("Could not submit latest assertion to L1", log.Ctx{"err": err})
5252
}
5353
case <-ctx.Done():
5454
return

‎assertions/scanner.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -79,20 +79,20 @@ func NewScanner(
7979
func (s *Scanner) Start(ctx context.Context) {
8080
latestConfirmed, err := s.chain.LatestConfirmed(ctx)
8181
if err != nil {
82-
srvlog.Error("Could not get latest confirmed assertion", err)
82+
srvlog.Error("Could not get latest confirmed assertion", log.Ctx{"err": err})
8383
return
8484
}
8585
fromBlock, err := latestConfirmed.CreatedAtBlock()
8686
if err != nil {
87-
srvlog.Error("Could not get creation block", err)
87+
srvlog.Error("Could not get creation block", log.Ctx{"err": err})
8888
return
8989
}
9090

9191
filterer, err := retry.UntilSucceeds(ctx, func() (*rollupgen.RollupUserLogicFilterer, error) {
9292
return rollupgen.NewRollupUserLogicFilterer(s.rollupAddr, s.backend)
9393
})
9494
if err != nil {
95-
srvlog.Error("Could not get rollup user logic filterer", err)
95+
srvlog.Error("Could not get rollup user logic filterer", log.Ctx{"err": err})
9696
return
9797
}
9898
ticker := time.NewTicker(s.pollInterval)
@@ -102,7 +102,7 @@ func (s *Scanner) Start(ctx context.Context) {
102102
case <-ticker.C:
103103
latestBlock, err := s.backend.HeaderByNumber(ctx, nil)
104104
if err != nil {
105-
srvlog.Error("Could not get header by number", err)
105+
srvlog.Error("Could not get header by number", log.Ctx{"err": err})
106106
continue
107107
}
108108
if !latestBlock.Number.IsUint64() {
@@ -122,7 +122,7 @@ func (s *Scanner) Start(ctx context.Context) {
122122
return true, s.checkForAssertionAdded(ctx, filterer, filterOpts)
123123
})
124124
if err != nil {
125-
srvlog.Error("Could not check for assertion added", err)
125+
srvlog.Error("Could not check for assertion added", log.Ctx{"err": err})
126126
return
127127
}
128128
fromBlock = toBlock
@@ -143,7 +143,7 @@ func (s *Scanner) checkForAssertionAdded(
143143
}
144144
defer func() {
145145
if err = it.Close(); err != nil {
146-
srvlog.Error("Could not close filter iterator", err)
146+
srvlog.Error("Could not close filter iterator", log.Ctx{"err": err})
147147
}
148148
}()
149149
for it.Next() {

‎challenge-manager/chain-watcher/watcher.go

+21-21
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ func (w *Watcher) Start(ctx context.Context) {
164164
return w.getStartEndBlockNum(ctx)
165165
})
166166
if err != nil {
167-
srvlog.Error("Could not get start and end block num", err)
167+
srvlog.Error("Could not get start and end block num", log.Ctx{"err": err})
168168
return
169169
}
170170
fromBlock := scanRange.startBlockNum
@@ -175,14 +175,14 @@ func (w *Watcher) Start(ctx context.Context) {
175175
return w.chain.SpecChallengeManager(ctx)
176176
})
177177
if err != nil {
178-
srvlog.Error("Could not get spec challenge manager", err)
178+
srvlog.Error("Could not get spec challenge manager", log.Ctx{"err": err})
179179
return
180180
}
181181
filterer, err := retry.UntilSucceeds(ctx, func() (*challengeV2gen.EdgeChallengeManagerFilterer, error) {
182182
return challengeV2gen.NewEdgeChallengeManagerFilterer(challengeManager.Address(), w.backend)
183183
})
184184
if err != nil {
185-
srvlog.Error("Could not initialize edge challenge manager filterer", err)
185+
srvlog.Error("Could not initialize edge challenge manager filterer", log.Ctx{"err": err})
186186
return
187187
}
188188
filterOpts := &bind.FilterOpts{
@@ -196,35 +196,35 @@ func (w *Watcher) Start(ctx context.Context) {
196196
return true, w.checkForEdgeAdded(ctx, filterer, filterOpts)
197197
})
198198
if err != nil {
199-
srvlog.Error("Could not check for edge added", err)
199+
srvlog.Error("Could not check for edge added", log.Ctx{"err": err})
200200
return
201201
}
202202
_, err = retry.UntilSucceeds(ctx, func() (bool, error) {
203203
return true, w.checkForEdgeConfirmedByOneStepProof(ctx, filterer, filterOpts)
204204
})
205205
if err != nil {
206-
srvlog.Error("Could not check for edge confirmed by osp", err)
206+
srvlog.Error("Could not check for edge confirmed by osp", log.Ctx{"err": err})
207207
return
208208
}
209209
_, err = retry.UntilSucceeds(ctx, func() (bool, error) {
210210
return true, w.checkForEdgeConfirmedByChildren(ctx, filterer, filterOpts)
211211
})
212212
if err != nil {
213-
srvlog.Error("Could not check for edge confirmed by children", err)
213+
srvlog.Error("Could not check for edge confirmed by children", log.Ctx{"err": err})
214214
return
215215
}
216216
_, err = retry.UntilSucceeds(ctx, func() (bool, error) {
217217
return true, w.checkForEdgeConfirmedByClaim(ctx, filterer, filterOpts)
218218
})
219219
if err != nil {
220-
srvlog.Error("Could not check for edge confirmed by claim", err)
220+
srvlog.Error("Could not check for edge confirmed by claim", log.Ctx{"err": err})
221221
return
222222
}
223223
_, err = retry.UntilSucceeds(ctx, func() (bool, error) {
224224
return true, w.checkForEdgeConfirmedByTime(ctx, filterer, filterOpts)
225225
})
226226
if err != nil {
227-
srvlog.Error("Could not check for edge confirmed by time", err)
227+
srvlog.Error("Could not check for edge confirmed by time", log.Ctx{"err": err})
228228
return
229229
}
230230

@@ -238,7 +238,7 @@ func (w *Watcher) Start(ctx context.Context) {
238238
case <-ticker.C:
239239
latestBlock, err := w.backend.HeaderByNumber(ctx, nil)
240240
if err != nil {
241-
srvlog.Error("Could not get latest header", err)
241+
srvlog.Error("Could not get latest header", log.Ctx{"err": err})
242242
continue
243243
}
244244
if !latestBlock.Number.IsUint64() {
@@ -254,14 +254,14 @@ func (w *Watcher) Start(ctx context.Context) {
254254
return w.chain.SpecChallengeManager(ctx)
255255
})
256256
if err != nil {
257-
srvlog.Error("Could not get spec challenge manager", err)
257+
srvlog.Error("Could not get spec challenge manager", log.Ctx{"err": err})
258258
return
259259
}
260260
filterer, err = retry.UntilSucceeds(ctx, func() (*challengeV2gen.EdgeChallengeManagerFilterer, error) {
261261
return challengeV2gen.NewEdgeChallengeManagerFilterer(challengeManager.Address(), w.backend)
262262
})
263263
if err != nil {
264-
srvlog.Error("Could not get challenge manager filterer", err)
264+
srvlog.Error("Could not get challenge manager filterer", log.Ctx{"err": err})
265265
return
266266
}
267267
filterOpts := &bind.FilterOpts{
@@ -270,23 +270,23 @@ func (w *Watcher) Start(ctx context.Context) {
270270
Context: ctx,
271271
}
272272
if err = w.checkForEdgeAdded(ctx, filterer, filterOpts); err != nil {
273-
srvlog.Error("Could not check for edge added", err)
273+
srvlog.Error("Could not check for edge added", log.Ctx{"err": err})
274274
continue
275275
}
276276
if err = w.checkForEdgeConfirmedByOneStepProof(ctx, filterer, filterOpts); err != nil {
277-
srvlog.Error("Could not check for edge confirmed by osp", err)
277+
srvlog.Error("Could not check for edge confirmed by osp", log.Ctx{"err": err})
278278
continue
279279
}
280280
if err = w.checkForEdgeConfirmedByChildren(ctx, filterer, filterOpts); err != nil {
281-
srvlog.Error("Could not check for edge confirmed by children", err)
281+
srvlog.Error("Could not check for edge confirmed by children", log.Ctx{"err": err})
282282
continue
283283
}
284284
if err = w.checkForEdgeConfirmedByTime(ctx, filterer, filterOpts); err != nil {
285-
srvlog.Error("Could not check for edge confirmed by time", err)
285+
srvlog.Error("Could not check for edge confirmed by time", log.Ctx{"err": err})
286286
continue
287287
}
288288
if err = w.checkForEdgeConfirmedByClaim(ctx, filterer, filterOpts); err != nil {
289-
srvlog.Error("Could not check for edge confirmed by claim", err)
289+
srvlog.Error("Could not check for edge confirmed by claim", log.Ctx{"err": err})
290290
continue
291291
}
292292
fromBlock = toBlock
@@ -355,7 +355,7 @@ func (w *Watcher) checkForEdgeAdded(
355355
}
356356
defer func() {
357357
if err = it.Close(); err != nil {
358-
srvlog.Error("Could not close filter iterator", err)
358+
srvlog.Error("Could not close filter iterator", log.Ctx{"err": err})
359359
}
360360
}()
361361
for it.Next() {
@@ -439,7 +439,7 @@ func (w *Watcher) checkForEdgeConfirmedByOneStepProof(
439439
}
440440
defer func() {
441441
if err = it.Close(); err != nil {
442-
srvlog.Error("Could not close filter iterator", err)
442+
srvlog.Error("Could not close filter iterator", log.Ctx{"err": err})
443443
}
444444
}()
445445
for it.Next() {
@@ -477,7 +477,7 @@ func (w *Watcher) checkForEdgeConfirmedByTime(
477477
}
478478
defer func() {
479479
if err = it.Close(); err != nil {
480-
srvlog.Error("Could not close filter iterator", err)
480+
srvlog.Error("Could not close filter iterator", log.Ctx{"err": err})
481481
}
482482
}()
483483
for it.Next() {
@@ -515,7 +515,7 @@ func (w *Watcher) checkForEdgeConfirmedByChildren(
515515
}
516516
defer func() {
517517
if err = it.Close(); err != nil {
518-
srvlog.Error("Could not close filter iterator", err)
518+
srvlog.Error("Could not close filter iterator", log.Ctx{"err": err})
519519
}
520520
}()
521521
for it.Next() {
@@ -553,7 +553,7 @@ func (w *Watcher) checkForEdgeConfirmedByClaim(
553553
}
554554
defer func() {
555555
if err = it.Close(); err != nil {
556-
srvlog.Error("Could not close filter iterator", err)
556+
srvlog.Error("Could not close filter iterator", log.Ctx{"err": err})
557557
}
558558
}()
559559
for it.Next() {

‎challenge-manager/challenges.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,11 @@ func (m *Manager) ChallengeAssertion(ctx context.Context, id protocol.AssertionH
3232
return errors.New("assertion creation info inbox max count was not a uint64")
3333
}
3434
if verifiedErr := m.watcher.AddVerifiedHonestEdge(ctx, levelZeroEdge); verifiedErr != nil {
35-
srvlog.Error("could not add verified honest edge with id %#x to chain watcher: %w", levelZeroEdge.Id(), verifiedErr)
35+
fields := log.Ctx{
36+
"edgeId": levelZeroEdge.Id(),
37+
"err": verifiedErr,
38+
}
39+
srvlog.Error("could not add verified honest edge with id %#x to chain watcher: %w", fields)
3640
}
3741
// Start tracking the challenge.
3842
tracker, err := edgetracker.New(

‎challenge-manager/edge-tracker/tracker.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -538,10 +538,10 @@ func (et *Tracker) bisect(ctx context.Context) (protocol.SpecEdge, protocol.Spec
538538
if addVerifiedErr := et.chainWatcher.AddVerifiedHonestEdge(ctx, firstChild); addVerifiedErr != nil {
539539
// We simply log an error, as if this fails, it will be added later on by the chain watcher
540540
// scraping events from the chain, but this is a helpful optimization.
541-
srvlog.Error("Could not add verified honest edge to chain watcher", addVerifiedErr)
541+
srvlog.Error("Could not add verified honest edge to chain watcher", log.Ctx{"err": addVerifiedErr})
542542
}
543543
if addVerifiedErr := et.chainWatcher.AddVerifiedHonestEdge(ctx, secondChild); addVerifiedErr != nil {
544-
srvlog.Error("Could not add verified honest edge to chain watcher", addVerifiedErr)
544+
srvlog.Error("Could not add verified honest edge to chain watcher", log.Ctx{"err": addVerifiedErr})
545545
}
546546
return firstChild, secondChild, nil
547547
}
@@ -643,7 +643,7 @@ func (et *Tracker) openSubchallengeLeaf(ctx context.Context) error {
643643
if addVerifiedErr := et.chainWatcher.AddVerifiedHonestEdge(ctx, addedLeaf); addVerifiedErr != nil {
644644
// We simply log an error, as if this fails, it will be added later on by the chain watcher
645645
// scraping events from the chain, but this is a helpful optimization.
646-
srvlog.Error("Could not add verified honest edge to chain watcher", addVerifiedErr)
646+
srvlog.Error("Could not add verified honest edge to chain watcher", log.Ctx{"err": addVerifiedErr})
647647
}
648648

649649
tracker, err := New(

0 commit comments

Comments
 (0)