Skip to content

Commit a9afe83

Browse files
committed
Add code to avoid merge conflict
1 parent e8d5588 commit a9afe83

File tree

1 file changed

+2
-2
lines changed
  • legacy/app/archive-query-service

1 file changed

+2
-2
lines changed

legacy/app/archive-query-service/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ func run() error {
4141
GrpcHost string `conf:"default:0.0.0.0:8001"`
4242
ProfilingHost string `conf:"default:0.0.0.0:8002"`
4343
StatusServiceGrpcHost string `conf:"default:127.0.0.1:9901"`
44-
StatusDataCacheTtl time.Duration `conf:"default:1s"`
45-
EmptyTicksTtl time.Duration `conf:"default:24h"`
44+
StatusDataCacheTtl time.Duration `conf:"default:1s"` // nolint:revive
45+
EmptyTicksTtl time.Duration `conf:"default:24h"` // nolint:revive
4646
MaxRecvSizeInMb int `conf:"default:1"`
4747
MaxSendSizeInMb int `conf:"default:10"`
4848
}

0 commit comments

Comments
 (0)