The Linux platform KVS init should ignore multiple init calls

project-chip · Mar 8, 2022 · 9f2e518 · 9f2e518
1 parent c0373bb
commit 9f2e518
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/platform/Linux/CHIPLinuxStorage.cpp b/src/platform/Linux/CHIPLinuxStorage.cpp
@@ -53,6 +53,13 @@ CHIP_ERROR ChipLinuxStorage::Init(const char * configFile)
 {
     CHIP_ERROR retval = CHIP_NO_ERROR;
 
+    ChipLogDetail(DeviceLayer, "ChipLinuxStorage::Init: Using KVS config file: %s", configFile);
+    if (mInitialized)
+    {
+        ChipLogError(DeviceLayer, "ChipLinuxStorage::Init: Attempt to re-initialize with KVS config file: %s", configFile);
+        return CHIP_NO_ERROR;
+    }
+
     mConfigPath.assign(configFile);
     retval = ChipLinuxStorageIni::Init();
 
@@ -76,6 +83,8 @@ CHIP_ERROR ChipLinuxStorage::Init(const char * configFile)
         retval = ChipLinuxStorageIni::AddConfig(mConfigPath);
     }
 
+    mInitialized = true;
+
     return retval;
 }
 

diff --git a/src/platform/Linux/CHIPLinuxStorage.h b/src/platform/Linux/CHIPLinuxStorage.h
@@ -88,6 +88,7 @@ class ChipLinuxStorage : private ChipLinuxStorageIni
     std::mutex mLock;
     bool mDirty;
     std::string mConfigPath;
+    bool mInitialized = false;
 };
 
 } // namespace Internal