Merge branch 'keydbpro' into PRO_RELEASE_6
Former-commit-id: ad5a015388a3180bcbfefebf106a1a56e304e380
This commit is contained in:
commit
56d10420a2
@ -297,6 +297,8 @@ sds g_sdsProvider = nullptr;
|
|||||||
sds g_sdsArgs = nullptr;
|
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)
|
||||||
@ -332,6 +334,14 @@ bool initializeStorageProvider(const char **err)
|
|||||||
}
|
}
|
||||||
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() {
|
||||||
for (standardConfig *config = configs; config->name != NULL; config++) {
|
for (standardConfig *config = configs; config->name != NULL; config++) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user