Select db on new redis context

greenbone · Nov 23, 2022 · 27b8cde · 27b8cde
1 parent bf07a27
commit 27b8cde
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/rust/nvtcache/src/nvtcache.rs b/rust/nvtcache/src/nvtcache.rs
@@ -13,8 +13,7 @@ pub mod nvtcache {
     impl NvtCache {
         /// initialize the NVT Cache.
         pub fn init() -> Result<NvtCache> {
-            let mut rctx = RedisCtx::new()?;
-            let kbi = rctx.select_database()?;
+            let rctx = RedisCtx::new()?;
             Ok(NvtCache {
                 cache: rctx,
                 init: true,

diff --git a/rust/nvtcache/src/redisconnector.rs b/rust/nvtcache/src/redisconnector.rs
@@ -19,11 +19,13 @@ pub mod redisconnector {
         pub fn new() -> Result<RedisCtx> {
             let client = redis::Client::open(REDIS_DEFAULT_PATH)?;
             let kb = client.get_connection()?;
-            Ok(RedisCtx {
+            let mut redisctx = RedisCtx {
                 kb,
                 db: 0,
                 maxdb: 0,
-            })
+            };
+            let _kbi = redisctx.select_database()?;
+            Ok(redisctx)
         }
 
         pub fn max_db_index(&mut self) -> Result<u32> {
@@ -88,7 +90,8 @@ pub mod redisconnector {
         }
 
         pub fn try_database(&mut self, dbi: u32) -> Result<u32> {
-            return Ok(1);
+            let kbi = self.kb.hset_nx(GLOBAL_DBINDEX_NAME, dbi, 1)?;
+            Ok(kbi)
         }
 
         pub fn select_database(&mut self) -> Result<u32> {