Merge pull request #74 from untangle/mfw-2339-save-confirmation-hangs

MFW-2339 Move saveLocker lock and remove defer in favor of explict un…
untangle · Oct 25, 2022 · 41c23d3 · 41c23d3
2 parents c8addcc + f83f7fa
commit 41c23d3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/services/settings/settings.go b/services/settings/settings.go
@@ -151,8 +151,6 @@ func SetSettingsFile(segments []string, value interface{}, filename string, forc
 	if err != nil {
 		return createJSONErrorObject(err), err
 	}
-	saveLocker.Lock()
-	defer saveLocker.Unlock()
 
 	newSettings, err = setSettingsInJSON(jsonSettings, segments, value)
 	if err != nil {
@@ -164,7 +162,9 @@ func SetSettingsFile(segments []string, value interface{}, filename string, forc
 		return createJSONErrorObject(err), err
 	}
 
+	saveLocker.Lock()
 	output, err := syncAndSave(jsonSettings, filename, force)
+	saveLocker.Unlock()
 	if err != nil {
 		var errJSON map[string]interface{}
 		marshalErr := json.Unmarshal([]byte(err.Error()), &errJSON)