Unverified Commit d8e2233a authored by Kevin Di Lallo's avatar Kevin Di Lallo Committed by GitHub
Browse files

Merge pull request #163 from dilallkx/kd_sp45_dev_db 

GIS Cache fixes
parents ad204b6b f2a45660

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

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ func Init() (err error) { 
	log.Info("Connected to Session Manager")



	// Connect to GIS cache

	ge.gisCache, err = gc.NewGisCache(redisAddr)

	ge.gisCache, err = gc.NewGisCache(ge.sandboxName, redisAddr)

	if err != nil {

		log.Error("Failed to GIS Cache: ", err.Error())

		return err

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

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ func Init(cfg SbiCfg) (err error) { 
	log.Info("Active Scenario Model created")



	// Connect to GIS cache

	sbi.gisCache, err = gc.NewGisCache(cfg.RedisAddr)

	sbi.gisCache, err = gc.NewGisCache(sbi.sandboxName, cfg.RedisAddr)

	if err != nil {

		log.Error("Failed to GIS Cache: ", err.Error())

		return err

go-apps/meep-rnis/sbi/rnis-sbi.go

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ func Init(cfg SbiCfg) (err error) { 
	}



	// Connect to GIS cache

	sbi.gisCache, err = gc.NewGisCache(cfg.RedisAddr)

	sbi.gisCache, err = gc.NewGisCache(sbi.sandboxName, cfg.RedisAddr)

	if err != nil {

		log.Error("Failed to GIS Cache: ", err.Error())

		return err

go-apps/meep-wais/sbi/wais-sbi.go

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ func Init(cfg SbiCfg) (err error) { 
	}



	// Connect to GIS cache

	sbi.gisCache, err = gc.NewGisCache(cfg.RedisAddr)

	sbi.gisCache, err = gc.NewGisCache(sbi.sandboxName, cfg.RedisAddr)

	if err != nil {

		log.Error("Failed to GIS Cache: ", err.Error())

		return err

go-packages/meep-data-key-mgr/data-key-mgr.go

+2 −1
Original line number Diff line number Diff line
@@ -18,9 +18,10 @@ package datakeymgr 


const keyRoot = "data:"

const keyRootGlobal = keyRoot + "global:"

const keyRootSandbox = keyRoot + "sbox:"



func GetKeyRoot(namespace string) string {

	return keyRoot + namespace + ":"

	return keyRootSandbox + namespace + ":"

}



func GetKeyRootGlobal() string {