X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=cmd%2Fappmgr%2Fdb.go;h=97865c28acb964bdb9134b609c272274d97c5de0;hb=refs%2Fchanges%2F93%2F1893%2F1;hp=6f772c0f6f190522cca837be1d92490cc75203e5;hpb=193caf9d7e08b84a0b9c1f0352924a7efd77e77c;p=ric-plt%2Fappmgr.git diff --git a/cmd/appmgr/db.go b/cmd/appmgr/db.go index 6f772c0..97865c2 100755 --- a/cmd/appmgr/db.go +++ b/cmd/appmgr/db.go @@ -33,14 +33,14 @@ type DB struct { func (d *DB) Create() { ns := viper.GetString("db.sessionNamespace") - d.session = sdl.Create(ns) + d.session = sdl.NewSdlInstance(ns, sdl.NewDatabase()) // Test DB connection, and wait until ready! for { if _, err := d.session.GetAll(); err == nil { return } - mdclog(MdclogErr, "Database connection not ready, waiting ...") + Logger.Error("Database connection not ready, waiting ...") time.Sleep(time.Duration(5 * time.Second)) } } @@ -51,12 +51,12 @@ func (d *DB) StoreSubscriptions(m cmap.ConcurrentMap) { data, err := json.Marshal(s.req) if err != nil { - mdclog(MdclogErr, "json.marshal failed: "+err.Error()) + Logger.Error("json.marshal failed: %v ", err.Error()) return } if err := d.session.Set(s.req.Id, data); err != nil { - mdclog(MdclogErr, "DB.session.Set failed: "+err.Error()) + Logger.Error("DB.session.Set failed: %v ", err.Error()) } } } @@ -66,20 +66,20 @@ func (d *DB) RestoreSubscriptions() (m cmap.ConcurrentMap) { keys, err := d.session.GetAll() if err != nil { - mdclog(MdclogErr, "DB.session.GetAll failed: "+err.Error()) + Logger.Error("DB.session.GetAll failed: %v ", err.Error()) return } for _, key := range keys { value, err := d.session.Get([]string{key}) if err != nil { - mdclog(MdclogErr, "DB.session.Get failed: "+err.Error()) + Logger.Error("DB.session.Get failed: %v ", err.Error()) return } var item SubscriptionReq if err = json.Unmarshal([]byte(value[key].(string)), &item); err != nil { - mdclog(MdclogErr, "json.Unmarshal failed: "+err.Error()) + Logger.Error("json.Unmarshal failed: %v ", err.Error()) return }