Relocate the storage init configuration after server init in linux main

project-chip · May 25, 2022 · 4f20d48 · 4f20d48
1 parent 12fba68
commit 4f20d48
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/examples/platform/linux/AppMain.cpp b/examples/platform/linux/AppMain.cpp
@@ -241,9 +241,6 @@ int ChipLinuxAppInit(int argc, char * const argv[], OptionSet * customOptions)
     SuccessOrExit(err);
     DeviceLayer::SetCommissionableDataProvider(&gCommissionableDataProvider);
 
-    gExampleDeviceInfoProvider.SetStorageDelegate(&chip::Server::GetInstance().GetPersistentStorage());
-    DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
-
     err = chip::examples::InitConfigurationManager(reinterpret_cast<ConfigurationManagerImpl &>(ConfigurationMgr()),
                                                    LinuxDeviceOptions::GetInstance());
     SuccessOrExit(err);
@@ -355,6 +352,9 @@ void ChipLinuxAppMainLoop()
     // Init ZCL Data Model and CHIP App Server
     Server::GetInstance().Init(initParams);
 
+    gExampleDeviceInfoProvider.SetStorageDelegate(&chip::Server::GetInstance().GetPersistentStorage());
+    DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
+
     // Now that the server has started and we are done with our startup logging,
     // log our discovery/onboarding information again so it's not lost in the
     // noise.