Merge pull request #361 from lucaslorentz/fix-298

lucaslorentz · web-flow · commit e1d70e75bffd · 2022-05-10T01:27:26.000+02:00
Fix #298
diff --git a/plugin/generator/generator.go b/plugin/generator/generator.go
@@ -173,7 +173,7 @@ func (g *CaddyfileGenerator) GenerateCaddyfile(logger *zap.Logger) ([]byte, []st
 				logger.Error("Failed to get Swarm services", zap.Error(err))
 			}
 		} else {
-			logger.Info("Skipping swarm services because swarm is not available")
+			logger.Debug("Skipping swarm services because swarm is not available")
 		}	
 	}
 
diff --git a/plugin/generator/services_test.go b/plugin/generator/services_test.go
@@ -169,8 +169,7 @@ func TestServices_SwarmDisabled(t *testing.T) {
 
 	const expectedCaddyfile = "# Empty caddyfile"
 
-	const expectedLogs = containerIdLog + ingressNetworksMapLog + swarmIsDisabledLog +
-		"INFO	Skipping swarm services because swarm is not available\n"
+	const expectedLogs = containerIdLog + ingressNetworksMapLog + swarmIsDisabledLog
 
 	testGeneration(t, dockerClient, nil, expectedCaddyfile, expectedLogs)
 }

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ func (g CaddyfileGenerator) GenerateCaddyfile(logger zap.Logger) ([]byte, []st`
`173`	`173`	`logger.Error("Failed to get Swarm services", zap.Error(err))`
`174`	`174`	`}`
`175`	`175`	`} else {`
`176`		`- logger.Info("Skipping swarm services because swarm is not available")`
	`176`	`+ logger.Debug("Skipping swarm services because swarm is not available")`
`177`	`177`	`}`
`178`	`178`	`}`
`179`	`179`
Original file line number	Diff line number	Diff line change
`@@ -169,8 +169,7 @@ func TestServices_SwarmDisabled(t *testing.T) {`
`169`	`169`
`170`	`170`	`const expectedCaddyfile = "# Empty caddyfile"`
`171`	`171`
`172`		`- const expectedLogs = containerIdLog + ingressNetworksMapLog + swarmIsDisabledLog +`
`173`		`- "INFO Skipping swarm services because swarm is not available\n"`
	`172`	`+ const expectedLogs = containerIdLog + ingressNetworksMapLog + swarmIsDisabledLog`
`174`	`173`
`175`	`174`	`testGeneration(t, dockerClient, nil, expectedCaddyfile, expectedLogs)`
`176`	`175`	`}`