Commit 7dd4b6e3 authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

review follow-up fixes

parent 4cf20178

go-apps/meep-ams/server/ams.go

+4 −4
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ func getAppInstanceId() (id string, err error) { 
	appInfo.Id = instanceId

	appInfo.Name = serviceCategory

	appInfo.Type_ = "SYSTEM"

	appInfo.MepName = mepName

	appInfo.NodeName = mepName

	if mepName == defaultMepName {

		appInfo.Persist = true

	} else {
@@ -988,11 +988,11 @@ func checkMpNotificationRegisteredSubscriptions(appId string, assocId *Associate 
				appId := app.Id

				appName := app.Name

				targetAppId := ""

				if mepId == app.Mep {

				if mepId == app.Node {

					targetAppId = appId

				} else {

					for _, appFromMap := range appMap {

						if appFromMap.Name == appName && appFromMap.Mep == mepId {

						if appFromMap.Name == appName && appFromMap.Node == mepId {

							targetAppId = appFromMap.Id

							break

						}
@@ -1905,7 +1905,7 @@ func updateDeviceInfo(address string, zoneId string, procList []string) { 
			for _, appInstanceId := range appInstanceIdsList.AppInstanceIds {

				// Only send notifications for AppInstanceIDs in the source MEP coverage area

				if app, found := appMap[appInstanceId]; found {

					if app.Mep == mepZonesMap[oldZoneId] {

					if app.Node == mepZonesMap[oldZoneId] {

						checkMpNotificationRegisteredSubscriptions(appInstanceId, &assocId, mepZonesMap[zoneId])

					}

				}

go-apps/meep-app-enablement/server/app-support/app-support.go

+2 −2
Original line number Diff line number Diff line
@@ -775,7 +775,7 @@ func updateAppInfo(appId string) error { 
	}



	// If MEP instance, ignore non-local apps

	if mepName != globalMepName && app.Mep != mepName {

	if mepName != globalMepName && app.Node != mepName {

		return nil

	}
@@ -783,7 +783,7 @@ func updateAppInfo(appId string) error { 
	appInfo := make(map[string]string)

	appInfo[fieldAppId] = appId

	appInfo[fieldName] = app.Name

	appInfo[fieldMep] = app.Mep

	appInfo[fieldMep] = app.Node

	appInfo[fieldType] = app.Type

	appInfo[fieldPersist] = strconv.FormatBool(app.Persist)

	appInfo[fieldState] = APP_STATE_INITIALIZED

go-apps/meep-loc-serv/server/loc-serv.go

+1 −1
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ func getAppInstanceId() (id string, err error) { 
	var appInfo scc.ApplicationInfo

	appInfo.Id = instanceId

	appInfo.Name = serviceCategory

	appInfo.MepName = mepName

	appInfo.NodeName = mepName

	appInfo.Type_ = "SYSTEM"

	if mepName == defaultMepName {

		appInfo.Persist = true

go-apps/meep-rnis/server/rnis.go

+1 −1
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ func getAppInstanceId() (id string, err error) { 
	appInfo.Id = instanceId

	appInfo.Name = serviceCategory

	appInfo.Type_ = "SYSTEM"

	appInfo.MepName = mepName

	appInfo.NodeName = mepName

	if mepName == defaultMepName {

		appInfo.Persist = true

	} else {

go-apps/meep-wais/server/wais.go

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ func getAppInstanceId() (id string, err error) { 
	appInfo.Id = instanceId

	appInfo.Name = serviceCategory

	appInfo.Type_ = "SYSTEM"

	appInfo.MepName = mepName

	appInfo.NodeName = mepName

	if mepName == defaultMepName {

		appInfo.Persist = true

	} else {