Add mutex lock to nginxConfigCache in instance watcher service (#1151)

dhurley · web-flow · commit ded396d78101 · 2025-07-07T13:01:37.000+01:00
diff --git a/internal/watcher/instance/instance_watcher_service.go b/internal/watcher/instance/instance_watcher_service.go
@@ -218,10 +218,11 @@ func (iw *InstanceWatcherService) checkForUpdates(
 					"error", parseErr,
 				)
 			} else {
+				iw.cacheMutex.Lock()
 				iw.sendNginxConfigContextUpdate(newCtx, nginxConfigContext)
-				iw.nginxConfigCache[nginxConfigContext.InstanceID] = nginxConfigContext
 				proto.UpdateNginxInstanceRuntime(newInstance, nginxConfigContext)
-				iw.cacheMutex.Lock()
+
+				iw.nginxConfigCache[nginxConfigContext.InstanceID] = nginxConfigContext
 				iw.instanceCache[newInstance.GetInstanceMeta().GetInstanceId()] = newInstance
 				iw.cacheMutex.Unlock()
 			}

Original file line number	Diff line number	Diff line change
`@@ -218,10 +218,11 @@ func (iw *InstanceWatcherService) checkForUpdates(`
`218`	`218`	`"error", parseErr,`
`219`	`219`	`)`
`220`	`220`	`} else {`
	`221`	`+ iw.cacheMutex.Lock()`
`221`	`222`	`iw.sendNginxConfigContextUpdate(newCtx, nginxConfigContext)`
`222`		`- iw.nginxConfigCache[nginxConfigContext.InstanceID] = nginxConfigContext`
`223`	`223`	`proto.UpdateNginxInstanceRuntime(newInstance, nginxConfigContext)`
`224`		`- iw.cacheMutex.Lock()`
	`224`	`+`
	`225`	`+ iw.nginxConfigCache[nginxConfigContext.InstanceID] = nginxConfigContext`
`225`	`226`	`iw.instanceCache[newInstance.GetInstanceMeta().GetInstanceId()] = newInstance`
`226`	`227`	`iw.cacheMutex.Unlock()`
`227`	`228`	`}`