Commit 969fdc0d authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

gis-engine deadlock fix

parent fc72fc7e

go-apps/meep-gis-engine/server/gis-automation.go

+3 −2
Original line number Original line Diff line number Diff line
@@ -60,8 +60,6 @@ func resetAutomation() { 
}

}





func setAutomation(automationType string, state bool) (err error) {

func setAutomation(automationType string, state bool) (err error) {

	ge.mutex.Lock()

	defer ge.mutex.Unlock()





	// Validate automation type

	// Validate automation type

	if _, found := ge.automation[automationType]; !found {

	if _, found := ge.automation[automationType]; !found {
@@ -491,6 +489,9 @@ func geSetAutomationStateByName(w http.ResponseWriter, r *http.Request) { 
	}

	}





	// Set automation state

	// Set automation state

	ge.mutex.Lock()

	defer ge.mutex.Unlock()



	err := setAutomation(automationType, automationState)

	err := setAutomation(automationType, automationState)

	if err != nil {

	if err != nil {

		log.Error(err.Error())

		log.Error(err.Error())