1. docker
  2. Commit 4fa9ec3192897d485975dadc3fb3228c2de8e7d9
Browse code

daemon/logger: fix naked returns and slight refactor

daemon/logger/proxy.go:35:3: naked return in func `StartLogging` with 17 lines of code (nakedret)
return
^
daemon/logger/proxy.go:42:2: naked return in func `StartLogging` with 17 lines of code (nakedret)
return
^
daemon/logger/proxy.go:61:3: naked return in func `StopLogging` with 16 lines of code (nakedret)
return
^
daemon/logger/proxy.go:68:2: naked return in func `StopLogging` with 16 lines of code (nakedret)
return
^
daemon/logger/proxy.go:80:3: naked return in func `Capabilities` with 14 lines of code (nakedret)
return
^
daemon/logger/proxy.go:89:2: naked return in func `Capabilities` with 14 lines of code (nakedret)
return
^

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2025/02/19 07:55:05
Showing 1 changed files
daemon/logger/proxy.go
History View file @ 4fa9ec3
... ... 
@@ -32,14 +32,14 @@ func (pp *logPluginProxy) StartLogging(file string, info Info) (err error) {
32 32 
 	req.File = file
33 33 
 	req.Info = info
34 34 
 	if err = pp.Call("LogDriver.StartLogging", req, &ret); err != nil {
35 
-		return
35 
+		return err
36 36 
 	}
37 37
38 38 
 	if ret.Err != "" {
39 
-		err = errors.New(ret.Err)
39 
+		return errors.New(ret.Err)
40 40 
 	}
41 41
42 
-	return
42 
+	return nil
43 43 
 }
44 44
45 45 
 type logPluginProxyStopLoggingRequest struct {
... ... 
@@ -58,14 +58,14 @@ func (pp *logPluginProxy) StopLogging(file string) (err error) {
58 58
59 59 
 	req.File = file
60 60 
 	if err = pp.Call("LogDriver.StopLogging", req, &ret); err != nil {
61 
-		return
61 
+		return err
62 62 
 	}
63 63
64 64 
 	if ret.Err != "" {
65 
-		err = errors.New(ret.Err)
65 
+		return errors.New(ret.Err)
66 66 
 	}
67 67
68 
-	return
68 
+	return nil
69 69 
 }
70 70
71 71 
 type logPluginProxyCapabilitiesResponse struct {
... ... 
@@ -77,16 +77,14 @@ func (pp *logPluginProxy) Capabilities() (cap Capability, err error) {
77 77 
 	var ret logPluginProxyCapabilitiesResponse
78 78
79 79 
 	if err = pp.Call("LogDriver.Capabilities", nil, &ret); err != nil {
80 
-		return
80 
+		return Capability{}, err
81 81 
 	}
82 82
83 
-	cap = ret.Cap
84 
-
85 83 
 	if ret.Err != "" {
86 
-		err = errors.New(ret.Err)
84 
+		return Capability{}, errors.New(ret.Err)
87 85 
 	}
88 86
89 
-	return
87 
+	return ret.Cap, nil
90 88 
 }
91 89
92 90 
 type logPluginProxyReadLogsRequest struct {
... ... 
@@ -95,9 +93,8 @@ type logPluginProxyReadLogsRequest struct {
95 95 
 }
96 96
97 97 
 func (pp *logPluginProxy) ReadLogs(info Info, config ReadConfig) (stream io.ReadCloser, err error) {
98 
-	var req logPluginProxyReadLogsRequest
99 
-
100 
-	req.Info = info
101 
-	req.Config = config
102 
-	return pp.Stream("LogDriver.ReadLogs", req)
98 
+	return pp.Stream("LogDriver.ReadLogs", logPluginProxyReadLogsRequest{
99 
+		Info:   info,
100 
+		Config: config,
101 
+	})
103 102 
 }