diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2015-07-31 06:39:41 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2015-07-31 06:39:41 +0000 |
| commit | 74519c6abfeada675dfa0e4d035e45d58f0d9903 (patch) | |
| tree | aff17be71b7b6f93f3bd88892498b0f92cad152c | |
| parent | 33305e22554bff7a14a8f8c3156b6eed8f184d52 (diff) | |
Move InvalidConfiguration exception to CommonException.
Allows it to be used by S3Store, or in fact anything that uses Configuration.
| -rw-r--r-- | bin/bbackupd/BackupDaemon.cpp | 4 | ||||
| -rw-r--r-- | lib/backupclient/ClientException.txt | 1 | ||||
| -rw-r--r-- | lib/common/CommonException.txt | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/bin/bbackupd/BackupDaemon.cpp b/bin/bbackupd/BackupDaemon.cpp index 41b68d02..5b11097c 100644 --- a/bin/bbackupd/BackupDaemon.cpp +++ b/bin/bbackupd/BackupDaemon.cpp @@ -52,7 +52,7 @@ #include "SSLLib.h" #include "autogen_BackupProtocol.h" -#include "autogen_ClientException.h" +#include "autogen_CommonException.h" #include "autogen_ConversionException.h" #include "Archive.h" #include "BackupClientContext.h" @@ -358,7 +358,7 @@ void BackupDaemon::SetupInInitialProcess() if(missingRequiredKeys) { - THROW_EXCEPTION_MESSAGE(ClientException, InvalidConfiguration, + THROW_EXCEPTION_MESSAGE(CommonException, InvalidConfiguration, "Some required configuration keys are missing in " << GetConfigFileName()); } diff --git a/lib/backupclient/ClientException.txt b/lib/backupclient/ClientException.txt index 2e3b7a8a..04f88620 100644 --- a/lib/backupclient/ClientException.txt +++ b/lib/backupclient/ClientException.txt @@ -9,4 +9,3 @@ AssertFailed 1 ClockWentBackwards 2 Invalid (negative) sync period: perhaps your clock is going backwards? FailedToDeleteStoreObjectInfoFile 3 Failed to delete the StoreObjectInfoFile, backup cannot continue safely. CorruptStoreObjectInfoFile 4 The store object info file contained an invalid value and is probably corrupt. Try deleting it. -InvalidConfiguration 5 Some required values are missing or incorrect in the configuration file. diff --git a/lib/common/CommonException.txt b/lib/common/CommonException.txt index deca57ba..610ba1a8 100644 --- a/lib/common/CommonException.txt +++ b/lib/common/CommonException.txt @@ -56,3 +56,4 @@ DatabaseRecordBadSize 48 The database contains a record with an invalid size DatabaseIterateFailed 49 Failed to iterate over the database keys ReferenceNotFound 50 The database does not contain an expected reference TimersNotInitialised 51 The timer framework should have been ready at this point +InvalidConfiguration 52 Some required values are missing or incorrect in the configuration file. |