Skip to content

Commit a2bf458

Browse files
committed
refactor log/driver and upload with off gocognit linter
1 parent 5ce51c4 commit a2bf458

File tree

2 files changed

+141
-20
lines changed

2 files changed

+141
-20
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
* Refactored `log/driver.go` and extract funcs
12
* Refactored `internal/table/scanner/scanner.go` and extract funcs
23
* Refactored `log/topic.go` and extract funcs
34
* Refactored `internal/table/scanner/scanner_test.go` and extract funcs

log/driver.go

+140-20
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,33 @@ func Driver(l Logger, d trace.Detailer, opts ...Option) (t trace.Driver) {
1313
return internalDriver(wrapLogger(l, opts...), d)
1414
}
1515

16-
func internalDriver(l Logger, d trace.Detailer) (t trace.Driver) { //nolint:gocyclo
17-
t.OnResolve = func(
16+
func internalDriver(l Logger, d trace.Detailer) (t trace.Driver) {
17+
t.OnResolve = onResolve(l, d)
18+
t.OnInit = onInit(l, d)
19+
t.OnClose = onClose(l, d)
20+
t.OnConnDial = connDial(l, d)
21+
t.OnConnStateChange = connStateChange(l, d)
22+
t.OnConnPark = connPark(l, d)
23+
t.OnConnClose = onConnClose(l, d)
24+
t.OnConnInvoke = connInvoke(l, d)
25+
t.OnConnNewStream = connNewStream(l, d)
26+
t.OnConnBan = connBan(l, d)
27+
t.OnConnAllow = connAllow(l, d)
28+
t.OnRepeaterWakeUp = repeaterWakeUp(l, d)
29+
t.OnBalancerInit = balancerInit(l, d)
30+
t.OnBalancerClose = balancerClose(l, d)
31+
t.OnBalancerChooseEndpoint = balancerChooseEndpoint(l, d)
32+
t.OnBalancerUpdate = balancerUpdate(l, d)
33+
t.OnGetCredentials = getCredentials(l, d)
34+
35+
return t
36+
}
37+
38+
func onResolve(
39+
l Logger,
40+
d trace.Detailer,
41+
) func(info trace.DriverResolveStartInfo) func(trace.DriverResolveDoneInfo) {
42+
return func(
1843
info trace.DriverResolveStartInfo,
1944
) func(
2045
trace.DriverResolveDoneInfo,
@@ -46,7 +71,13 @@ func internalDriver(l Logger, d trace.Detailer) (t trace.Driver) { //nolint:gocy
4671
}
4772
}
4873
}
49-
t.OnInit = func(info trace.DriverInitStartInfo) func(trace.DriverInitDoneInfo) {
74+
}
75+
76+
func onInit(
77+
l Logger,
78+
d trace.Detailer,
79+
) func(info trace.DriverInitStartInfo) func(trace.DriverInitDoneInfo) {
80+
return func(info trace.DriverInitStartInfo) func(trace.DriverInitDoneInfo) {
5081
if d.Details()&trace.DriverEvents == 0 {
5182
return nil
5283
}
@@ -81,7 +112,13 @@ func internalDriver(l Logger, d trace.Detailer) (t trace.Driver) { //nolint:gocy
81112
}
82113
}
83114
}
84-
t.OnClose = func(info trace.DriverCloseStartInfo) func(trace.DriverCloseDoneInfo) {
115+
}
116+
117+
func onClose(
118+
l Logger,
119+
d trace.Detailer,
120+
) func(info trace.DriverCloseStartInfo) func(trace.DriverCloseDoneInfo) {
121+
return func(info trace.DriverCloseStartInfo) func(trace.DriverCloseDoneInfo) {
85122
if d.Details()&trace.DriverEvents == 0 {
86123
return nil
87124
}
@@ -103,7 +140,13 @@ func internalDriver(l Logger, d trace.Detailer) (t trace.Driver) { //nolint:gocy
103140
}
104141
}
105142
}
106-
t.OnConnDial = func(info trace.DriverConnDialStartInfo) func(trace.DriverConnDialDoneInfo) {
143+
}
144+
145+
func connDial(
146+
l Logger,
147+
d trace.Detailer,
148+
) func(info trace.DriverConnDialStartInfo) func(trace.DriverConnDialDoneInfo) {
149+
return func(info trace.DriverConnDialStartInfo) func(trace.DriverConnDialDoneInfo) {
107150
if d.Details()&trace.DriverConnEvents == 0 {
108151
return nil
109152
}
@@ -130,7 +173,13 @@ func internalDriver(l Logger, d trace.Detailer) (t trace.Driver) { //nolint:gocy
130173
}
131174
}
132175
}
133-
t.OnConnStateChange = func(info trace.DriverConnStateChangeStartInfo) func(trace.DriverConnStateChangeDoneInfo) {
176+
}
177+
178+
func connStateChange(
179+
l Logger,
180+
d trace.Detailer,
181+
) func(info trace.DriverConnStateChangeStartInfo) func(trace.DriverConnStateChangeDoneInfo) {
182+
return func(info trace.DriverConnStateChangeStartInfo) func(trace.DriverConnStateChangeDoneInfo) {
134183
if d.Details()&trace.DriverConnEvents == 0 {
135184
return nil
136185
}
@@ -150,7 +199,13 @@ func internalDriver(l Logger, d trace.Detailer) (t trace.Driver) { //nolint:gocy
150199
)
151200
}
152201
}
153-
t.OnConnPark = func(info trace.DriverConnParkStartInfo) func(trace.DriverConnParkDoneInfo) {
202+
}
203+
204+
func connPark(
205+
l Logger,
206+
d trace.Detailer,
207+
) func(info trace.DriverConnParkStartInfo) func(trace.DriverConnParkDoneInfo) {
208+
return func(info trace.DriverConnParkStartInfo) func(trace.DriverConnParkDoneInfo) {
154209
if d.Details()&trace.DriverConnEvents == 0 {
155210
return nil
156211
}
@@ -177,7 +232,13 @@ func internalDriver(l Logger, d trace.Detailer) (t trace.Driver) { //nolint:gocy
177232
}
178233
}
179234
}
180-
t.OnConnClose = func(info trace.DriverConnCloseStartInfo) func(trace.DriverConnCloseDoneInfo) {
235+
}
236+
237+
func onConnClose(
238+
l Logger,
239+
d trace.Detailer,
240+
) func(info trace.DriverConnCloseStartInfo) func(trace.DriverConnCloseDoneInfo) {
241+
return func(info trace.DriverConnCloseStartInfo) func(trace.DriverConnCloseDoneInfo) {
181242
if d.Details()&trace.DriverConnEvents == 0 {
182243
return nil
183244
}
@@ -204,7 +265,13 @@ func internalDriver(l Logger, d trace.Detailer) (t trace.Driver) { //nolint:gocy
204265
}
205266
}
206267
}
207-
t.OnConnInvoke = func(info trace.DriverConnInvokeStartInfo) func(trace.DriverConnInvokeDoneInfo) {
268+
}
269+
270+
func connInvoke(
271+
l Logger,
272+
d trace.Detailer,
273+
) func(info trace.DriverConnInvokeStartInfo) func(trace.DriverConnInvokeDoneInfo) {
274+
return func(info trace.DriverConnInvokeStartInfo) func(trace.DriverConnInvokeDoneInfo) {
208275
if d.Details()&trace.DriverConnEvents == 0 {
209276
return nil
210277
}
@@ -237,7 +304,14 @@ func internalDriver(l Logger, d trace.Detailer) (t trace.Driver) { //nolint:gocy
237304
}
238305
}
239306
}
240-
t.OnConnNewStream = func(
307+
}
308+
309+
func connNewStream(
310+
l Logger,
311+
d trace.Detailer,
312+
) func(info trace.DriverConnNewStreamStartInfo) func(trace.DriverConnNewStreamRecvInfo) func(
313+
trace.DriverConnNewStreamDoneInfo) {
314+
return func(
241315
info trace.DriverConnNewStreamStartInfo,
242316
) func(
243317
trace.DriverConnNewStreamRecvInfo,
@@ -294,7 +368,13 @@ func internalDriver(l Logger, d trace.Detailer) (t trace.Driver) { //nolint:gocy
294368
}
295369
}
296370
}
297-
t.OnConnBan = func(info trace.DriverConnBanStartInfo) func(trace.DriverConnBanDoneInfo) {
371+
}
372+
373+
func connBan(
374+
l Logger,
375+
d trace.Detailer,
376+
) func(info trace.DriverConnBanStartInfo) func(trace.DriverConnBanDoneInfo) {
377+
return func(info trace.DriverConnBanStartInfo) func(trace.DriverConnBanDoneInfo) {
298378
if d.Details()&trace.DriverConnEvents == 0 {
299379
return nil
300380
}
@@ -316,7 +396,13 @@ func internalDriver(l Logger, d trace.Detailer) (t trace.Driver) { //nolint:gocy
316396
)
317397
}
318398
}
319-
t.OnConnAllow = func(info trace.DriverConnAllowStartInfo) func(trace.DriverConnAllowDoneInfo) {
399+
}
400+
401+
func connAllow(
402+
l Logger,
403+
d trace.Detailer,
404+
) func(info trace.DriverConnAllowStartInfo) func(trace.DriverConnAllowDoneInfo) {
405+
return func(info trace.DriverConnAllowStartInfo) func(trace.DriverConnAllowDoneInfo) {
320406
if d.Details()&trace.DriverConnEvents == 0 {
321407
return nil
322408
}
@@ -335,7 +421,13 @@ func internalDriver(l Logger, d trace.Detailer) (t trace.Driver) { //nolint:gocy
335421
)
336422
}
337423
}
338-
t.OnRepeaterWakeUp = func(info trace.DriverRepeaterWakeUpStartInfo) func(trace.DriverRepeaterWakeUpDoneInfo) {
424+
}
425+
426+
func repeaterWakeUp(
427+
l Logger,
428+
d trace.Detailer,
429+
) func(info trace.DriverRepeaterWakeUpStartInfo) func(trace.DriverRepeaterWakeUpDoneInfo) {
430+
return func(info trace.DriverRepeaterWakeUpStartInfo) func(trace.DriverRepeaterWakeUpDoneInfo) {
339431
if d.Details()&trace.DriverRepeaterEvents == 0 {
340432
return nil
341433
}
@@ -366,7 +458,13 @@ func internalDriver(l Logger, d trace.Detailer) (t trace.Driver) { //nolint:gocy
366458
}
367459
}
368460
}
369-
t.OnBalancerInit = func(info trace.DriverBalancerInitStartInfo) func(trace.DriverBalancerInitDoneInfo) {
461+
}
462+
463+
func balancerInit(
464+
l Logger,
465+
d trace.Detailer,
466+
) func(info trace.DriverBalancerInitStartInfo) func(trace.DriverBalancerInitDoneInfo) {
467+
return func(info trace.DriverBalancerInitStartInfo) func(trace.DriverBalancerInitDoneInfo) {
370468
if d.Details()&trace.DriverBalancerEvents == 0 {
371469
return nil
372470
}
@@ -380,7 +478,13 @@ func internalDriver(l Logger, d trace.Detailer) (t trace.Driver) { //nolint:gocy
380478
)
381479
}
382480
}
383-
t.OnBalancerClose = func(info trace.DriverBalancerCloseStartInfo) func(trace.DriverBalancerCloseDoneInfo) {
481+
}
482+
483+
func balancerClose(
484+
l Logger,
485+
d trace.Detailer,
486+
) func(info trace.DriverBalancerCloseStartInfo) func(trace.DriverBalancerCloseDoneInfo) {
487+
return func(info trace.DriverBalancerCloseStartInfo) func(trace.DriverBalancerCloseDoneInfo) {
384488
if d.Details()&trace.DriverBalancerEvents == 0 {
385489
return nil
386490
}
@@ -402,7 +506,13 @@ func internalDriver(l Logger, d trace.Detailer) (t trace.Driver) { //nolint:gocy
402506
}
403507
}
404508
}
405-
t.OnBalancerChooseEndpoint = func(
509+
}
510+
511+
func balancerChooseEndpoint(
512+
l Logger,
513+
d trace.Detailer,
514+
) func(info trace.DriverBalancerChooseEndpointStartInfo) func(trace.DriverBalancerChooseEndpointDoneInfo) {
515+
return func(
406516
info trace.DriverBalancerChooseEndpointStartInfo,
407517
) func(
408518
trace.DriverBalancerChooseEndpointDoneInfo,
@@ -429,7 +539,13 @@ func internalDriver(l Logger, d trace.Detailer) (t trace.Driver) { //nolint:gocy
429539
}
430540
}
431541
}
432-
t.OnBalancerUpdate = func(
542+
}
543+
544+
func balancerUpdate(
545+
l Logger,
546+
d trace.Detailer,
547+
) func(info trace.DriverBalancerUpdateStartInfo) func(trace.DriverBalancerUpdateDoneInfo) {
548+
return func(
433549
info trace.DriverBalancerUpdateStartInfo,
434550
) func(
435551
trace.DriverBalancerUpdateDoneInfo,
@@ -453,7 +569,13 @@ func internalDriver(l Logger, d trace.Detailer) (t trace.Driver) { //nolint:gocy
453569
)
454570
}
455571
}
456-
t.OnGetCredentials = func(info trace.DriverGetCredentialsStartInfo) func(trace.DriverGetCredentialsDoneInfo) {
572+
}
573+
574+
func getCredentials(
575+
l Logger,
576+
d trace.Detailer,
577+
) func(info trace.DriverGetCredentialsStartInfo) func(trace.DriverGetCredentialsDoneInfo) {
578+
return func(info trace.DriverGetCredentialsStartInfo) func(trace.DriverGetCredentialsDoneInfo) {
457579
if d.Details()&trace.DriverCredentialsEvents == 0 {
458580
return nil
459581
}
@@ -477,6 +599,4 @@ func internalDriver(l Logger, d trace.Detailer) (t trace.Driver) { //nolint:gocy
477599
}
478600
}
479601
}
480-
481-
return t
482602
}

0 commit comments

Comments
 (0)