diff options
author | Chris Wilson <chris+github@qwirx.com> | 2015-06-28 19:36:37 +0000 |
---|---|---|
committer | Chris Wilson <chris+github@qwirx.com> | 2015-06-28 19:36:37 +0000 |
commit | 0c41e85dbbaccf0ed07c0277d64d37f0af380be2 (patch) | |
tree | 828cde6ff3d3e62d734d1dd18fca2825ace6e50a /lib/server | |
parent | 66031e625d512b82a2d9d1546773b9fc0f8645bd (diff) |
Refactor to allow non-bbstored store configurations.
Make some keys not required in BackupDaemonConfigVerify, and verify them
afterwards instead, when the rest of the configuration file has been read
(and in future, the store type would be known.)
Diffstat (limited to 'lib/server')
-rw-r--r-- | lib/server/Daemon.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/server/Daemon.cpp b/lib/server/Daemon.cpp index 995b04ce..836948bf 100644 --- a/lib/server/Daemon.cpp +++ b/lib/server/Daemon.cpp @@ -376,17 +376,17 @@ bool Daemon::Configure(const std::string& rConfigFileName) BOX_ERROR("Failed to load or verify configuration file"); return false; } - + if(!Configure(*apConfig)) { BOX_ERROR("Failed to verify configuration file"); - return false; + return false; } - + // Store configuration mConfigFileName = rConfigFileName; mLoadedConfigModifiedTime = GetConfigFileModifiedTime(); - + return true; } @@ -416,14 +416,14 @@ bool Daemon::Configure(const Configuration& rConfig) BOX_ERROR("Configuration errors: " << errors); return false; } - + // Store configuration mapConfiguration = apConf; - + // Let the derived class have a go at setting up stuff // in the initial process SetupInInitialProcess(); - + return true; } |