Merge pull request #51 from ipfs/fix/error-line-number

correctly display the line number when FinishWithErr fails
ipfs · Oct 3, 2018 · 5e6883f · 5e6883f
2 parents 4040da7 + d16d355
commit 5e6883f
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/log.go b/log.go
@@ -228,10 +228,10 @@ func (el *eventLogger) SetTags(ctx context.Context, tags map[string]interface{})
 	}
 }
 
-func (el *eventLogger) SetErr(ctx context.Context, err error) {
+func (el *eventLogger) setErr(ctx context.Context, err error, skip int) {
 	span := opentrace.SpanFromContext(ctx)
 	if span == nil {
-		_, file, line, _ := runtime.Caller(1)
+		_, file, line, _ := runtime.Caller(skip)
 		log.Errorf("SetErr with no Span in context called on %s:%d", path.Base(file), line)
 		return
 	}
@@ -243,6 +243,10 @@ func (el *eventLogger) SetErr(ctx context.Context, err error) {
 	span.LogKV("error", err.Error())
 }
 
+func (el *eventLogger) SetErr(ctx context.Context, err error) {
+	el.setErr(ctx, err, 1)
+}
+
 func (el *eventLogger) Finish(ctx context.Context) {
 	span := opentrace.SpanFromContext(ctx)
 	if span == nil {
@@ -254,7 +258,7 @@ func (el *eventLogger) Finish(ctx context.Context) {
 }
 
 func (el *eventLogger) FinishWithErr(ctx context.Context, err error) {
-	el.SetErr(ctx, err)
+	el.setErr(ctx, err, 2)
 	el.Finish(ctx)
 }