diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2008-04-04 21:59:29 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2008-04-04 21:59:29 +0000 |
| commit | 3661f3624acc46590d5504fda4f8714255fb2c8e (patch) | |
| tree | e2cd17e19718d3f46944979a23e4c93dcf92584b /lib/raidfile | |
| parent | 2f8d0c29536cdb306b525b78638727da4ead0022 (diff) | |
Tailorization
Import of the upstream sources from
Repository: http://localhost:8000/
Kind: hg
Revision: 7807b7768163f1c2537756abe5416063989cebb1
Original author: tailor@rocio.int.aidworld.org
Date: 2008-03-16 19:44:36+00:00
Diffstat (limited to 'lib/raidfile')
| -rw-r--r-- | lib/raidfile/RaidFileController.cpp | 13 | ||||
| -rw-r--r-- | lib/raidfile/RaidFileWrite.cpp | 8 |
2 files changed, 8 insertions, 13 deletions
diff --git a/lib/raidfile/RaidFileController.cpp b/lib/raidfile/RaidFileController.cpp index 86fa9df1..0cc2ede7 100644 --- a/lib/raidfile/RaidFileController.cpp +++ b/lib/raidfile/RaidFileController.cpp @@ -70,14 +70,11 @@ void RaidFileController::Initialise(const std::string& rConfigFilename) static const ConfigurationVerifyKey verifykeys[] = { - ConfigurationVerifyKey("SetNumber", - ConfigTest_Exists | ConfigTest_IsInt), - ConfigurationVerifyKey("BlockSize", - ConfigTest_Exists | ConfigTest_IsInt), - ConfigurationVerifyKey("Dir0", ConfigTest_Exists), - ConfigurationVerifyKey("Dir1", ConfigTest_Exists), - ConfigurationVerifyKey("Dir2", - ConfigTest_Exists | ConfigTest_LastEntry) + {"SetNumber", 0, ConfigTest_Exists | ConfigTest_IsInt, 0}, + {"BlockSize", 0, ConfigTest_Exists | ConfigTest_IsInt, 0}, + {"Dir0", 0, ConfigTest_Exists, 0}, + {"Dir1", 0, ConfigTest_Exists, 0}, + {"Dir2", 0, ConfigTest_Exists | ConfigTest_LastEntry, 0} }; static const ConfigurationVerify subverify = diff --git a/lib/raidfile/RaidFileWrite.cpp b/lib/raidfile/RaidFileWrite.cpp index c8c39dc4..66ab81c8 100644 --- a/lib/raidfile/RaidFileWrite.cpp +++ b/lib/raidfile/RaidFileWrite.cpp @@ -96,8 +96,7 @@ void RaidFileWrite::Open(bool AllowOverwrite) RaidFileUtil::ExistType existance = RaidFileUtil::RaidFileExists(rdiscSet, mFilename); if(existance != RaidFileUtil::NoFile) { - BOX_ERROR("Attempted to overwrite raidfile " << - mSetNumber << " " << mFilename); + TRACE2("Trying to overwrite raidfile %d %s\n", mSetNumber, mFilename.c_str()); THROW_EXCEPTION(RaidFileException, CannotOverwriteExistingFile) } } @@ -179,8 +178,7 @@ void RaidFileWrite::Write(const void *pBuffer, int Length) int written = ::write(mOSFileHandle, pBuffer, Length); if(written != Length) { - BOX_LOG_SYS_ERROR("RaidFileWrite failed, Length = " << - Length << ", written = " << written); + TRACE3("RaidFileWrite::Write: Write failure, Length = %d, written = %d, errno = %d\n", Length, written, errno); THROW_EXCEPTION(RaidFileException, OSError) } } @@ -781,7 +779,7 @@ int RaidFileWrite::Read(void *pBuffer, int NBytes, int Timeout) // -------------------------------------------------------------------------- void RaidFileWrite::Close() { - BOX_WARNING("RaidFileWrite::Close() called, discarding file"); + TRACE0("Warning: RaidFileWrite::Close() called, discarding file\n"); if(mOSFileHandle != -1) { Discard(); |