Skip to content

Commit 67f40d9

Browse files
committed
Minor code improvements- avoid shadow declarations and remove unused channel
1 parent f139c00 commit 67f40d9

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

pkg/dlx/handler.go

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,10 @@ func NewHandler(parentLogger logger.Logger,
7979
}
8080

8181
func (h *Handler) handleRequest(res http.ResponseWriter, req *http.Request) {
82+
var path string
83+
var err error
8284
var resourceNames []string
8385

84-
responseChannel := make(chan ResourceStatusResult, 1)
85-
defer close(responseChannel)
86-
8786
// first try to see if our request came from ingress controller
8887
forwardedHost := req.Header.Get("X-Forwarded-Host")
8988
forwardedPort := req.Header.Get("X-Forwarded-Port")
@@ -101,7 +100,7 @@ func (h *Handler) handleRequest(res http.ResponseWriter, req *http.Request) {
101100
resourceNames = append(resourceNames, resourceName)
102101
resourceTargetURLMap[resourceName] = targetURL
103102
} else {
104-
path, resourceNames, err := h.getResourceNameAndPath(req)
103+
path, resourceNames, err = h.getResourceNameAndPath(req)
105104
if err != nil {
106105
h.logger.WarnWith("Failed to get resource names and path from request",
107106
"error", err.Error(),
@@ -217,17 +216,17 @@ func (h *Handler) parseTargetURL(resourceName, path string) (*url.URL, int) {
217216
}
218217

219218
func (h *Handler) startResources(resourceNames []string) *ResourceStatusResult {
220-
responseChannel := make(chan ResourceStatusResult, len(resourceNames))
221-
defer close(responseChannel)
219+
responseChan := make(chan ResourceStatusResult, len(resourceNames))
220+
defer close(responseChan)
222221

223222
// Start all resources in separate go routines
224223
for _, resourceName := range resourceNames {
225-
go h.resourceStarter.handleResourceStart(resourceName, responseChannel)
224+
go h.resourceStarter.handleResourceStart(resourceName, responseChan)
226225
}
227226

228227
// Wait for all resources to finish starting
229228
for range resourceNames {
230-
statusResult := <-responseChannel
229+
statusResult := <-responseChan
231230

232231
if statusResult.Error != nil {
233232
h.logger.WarnWith("Failed to start resource",

0 commit comments

Comments
 (0)