BUG/MINOR: maps: MapQuitChan hangs when no sync maps initiated

mjuraga · mjuraga · commit 87e63bc31b2c · 2020-04-29T16:03:36.000+02:00
diff --git a/configure_data_plane.go b/configure_data_plane.go
@@ -553,10 +553,13 @@ func checkPassword(pass, storedPass string) bool {
 }
 
 func serverShutdown() {
+	cfg := dataplaneapi_config.Get()
 	if logFile != nil {
 		logFile.Close()
 	}
-	MapQuitChan <- MapQuitNotice{}
+	if cfg.HAProxy.UpdateMapFiles {
+		MapQuitChan <- MapQuitNotice{}
+	}
 }
 
 func configureNativeClient(haproxyOptions dataplaneapi_config.HAProxyConfiguration, mWorker bool) *client_native.HAProxyClient {

Original file line number	Diff line number	Diff line change
`@@ -553,10 +553,13 @@ func checkPassword(pass, storedPass string) bool {`
`553`	`553`	`}`
`554`	`554`
`555`	`555`	`func serverShutdown() {`
	`556`	`+ cfg := dataplaneapi_config.Get()`
`556`	`557`	`if logFile != nil {`
`557`	`558`	`logFile.Close()`
`558`	`559`	`}`
`559`		`- MapQuitChan <- MapQuitNotice{}`
	`560`	`+ if cfg.HAProxy.UpdateMapFiles {`
	`561`	`+ MapQuitChan <- MapQuitNotice{}`
	`562`	`+ }`
`560`	`563`	`}`
`561`	`564`
`562`	`565`	`func configureNativeClient(haproxyOptions dataplaneapi_config.HAProxyConfiguration, mWorker bool) *client_native.HAProxyClient {`