gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'keydbpro' into PRO_RELEASE_6

Browse Source 
Former-commit-id: ad5a015388a3180bcbfefebf106a1a56e304e380
This commit is contained in:
John Sully 2020-02-17 22:03:54 -05:00
commit 56d10420a2
1 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/config.cpp
View File

@ -298,6 +298,8 @@ sds g_sdsArgs = nullptr;
bool initializeStorageProvider(const char **err) bool initializeStorageProvider(const char **err)
{ {
try
{
bool fTest = false; bool fTest = false;
if (g_sdsProvider == nullptr) if (g_sdsProvider == nullptr)
return true; return true;
@ -331,6 +333,14 @@ bool initializeStorageProvider(const char **err)
*err = "Unknown storage provider"; *err = "Unknown storage provider";
} }
return g_pserver->m_pstorageFactory != nullptr; return g_pserver->m_pstorageFactory != nullptr;
}
catch(std::string str)
{
serverLog(LL_WARNING, "ERROR: Failed to initialize %s storage provider. Details to follow below.", g_sdsProvider);
serverLog(LL_WARNING, "\t%s", str.c_str());
serverLog(LL_WARNING, "KeyDB cannot start. Exiting.");
exit(EXIT_FAILURE);
}
} }
void initConfigValues() { void initConfigValues() {