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

review follow-up

parent 5e1959a5

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

+2 −1
Original line number Diff line number Diff line
@@ -616,7 +616,8 @@ func checkAppTermNotification(appInstanceId string, gracefulTimeout int32, needM 
				//start graceful shutdown timer

				gracefulTimeoutTicker := time.NewTicker(time.Duration(gracefulTimeout) * time.Second)

				appTerminationGracefulTimeoutMap[appInstanceId] = gracefulTimeoutTicker

				key := appEnablementBaseKey + ":apps:" + appInstanceId



				key := baseKey + ":app:" + appInstanceId + ":info"

				go func() {

					for range gracefulTimeoutTicker.C {

						log.Info("Graceful timeout expiry for ", appInstanceId, "---", appTerminationGracefulTimeoutMap[appInstanceId])

go-apps/meep-app-enablement/server/service-mgmt/service-mgmt.go

+4 −4
Original line number Diff line number Diff line
@@ -672,21 +672,21 @@ func appServicesByIdDELETE(w http.ResponseWriter, r *http.Request) { 


}



// Delete all services

func AppServicesDELETE(appInstanceId string) error {

	log.Info("AppServicesDELETE")



	var sInfoList ServiceInfoList



	keyName := appEnablementBaseKey + ":apps:" + appInstanceId + ":svcs:*"



	err := rc.ForEachJSONEntry(keyName, populateServiceInfoList, &sInfoList)

	key := baseKey + ":app:" + appInstanceId + ":svc:*"

	err := rc.ForEachJSONEntry(key, populateServiceInfoList, &sInfoList)

	if err != nil {

		log.Error(err.Error())

		return err

	}



	for _, sInfo := range sInfoList.ServiceInfos {

		err = rc.JSONDelEntry(appEnablementBaseKey+":apps:"+appInstanceId+":svcs:"+sInfo.SerInstanceId, ".")

		err = rc.JSONDelEntry(baseKey+":app:"+appInstanceId+":svc:"+sInfo.SerInstanceId, ".")

		if err != nil {

			log.Error(err.Error())

			return err

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

+1 −0
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ func Init() (err error) { 
	log.Info("MEEP_MEP_NAME: ", mepName)



	// Get App Enablement URL

	appEnablementEnabled = false

	appEnablementEnv := strings.TrimSpace(os.Getenv("MEEP_APP_ENABLEMENT"))

	if appEnablementEnv != "" {

		appEnablementUrl = "http://" + appEnablementEnv

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

+2 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ const serviceAppVersion = "2.1.1" 
var serviceAppInstanceId string



var appEnablementUrl string

var appEnablementEnabled bool = false

var appEnablementEnabled bool

var sendAppTerminationWhenDone bool = false

var appEnablementAppSupportClient *appSupportClient.APIClient

var appEnablementSrvMgmtClient *srvMgmtClient.APIClient
@@ -250,6 +250,7 @@ func Init() (err error) { 
	log.Info("MEEP_MEP_NAME: ", mepName)



	// Get App Enablement URL

	appEnablementEnabled = false

	appEnablementEnv := strings.TrimSpace(os.Getenv("MEEP_APP_ENABLEMENT"))

	if appEnablementEnv != "" {

		appEnablementUrl = "http://" + appEnablementEnv

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

+2 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ const serviceAppVersion = "2.1.1" 
var serviceAppInstanceId string



var appEnablementUrl string

var appEnablementEnabled bool = false

var appEnablementEnabled bool

var sendAppTerminationWhenDone bool = false

var appEnablementAppSupportClient *appSupportClient.APIClient

var appEnablementSrvMgmtClient *srvMgmtClient.APIClient
@@ -184,6 +184,7 @@ func Init() (err error) { 
	log.Info("MEEP_MEP_NAME: ", mepName)



	// Get App Enablement URL

	appEnablementEnabled = false

	appEnablementEnv := strings.TrimSpace(os.Getenv("MEEP_APP_ENABLEMENT"))

	if appEnablementEnv != "" {

		appEnablementUrl = "http://" + appEnablementEnv