diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2014-02-10 15:17:43 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2014-02-10 15:17:43 +0000 |
| commit | d2b7adf0d2abf671d36c1b3d5a22dd7d2069fcf9 (patch) | |
| tree | 551e52b742474b5fd18055599363397042e31067 /lib/common/NamedLock.cpp | |
| parent | 6d4016cc9d7be0bd3c8110382076cae35d9be161 (diff) | |
Include the filename in NamedLock exception messages.
Diffstat (limited to 'lib/common/NamedLock.cpp')
| -rw-r--r-- | lib/common/NamedLock.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/common/NamedLock.cpp b/lib/common/NamedLock.cpp index f96f80b5..3c2c99dd 100644 --- a/lib/common/NamedLock.cpp +++ b/lib/common/NamedLock.cpp @@ -88,7 +88,8 @@ bool NamedLock::TryAndGetLock(const std::string& rFilename, int mode) if(errno != EWOULDBLOCK) { // Not the expected error - THROW_EXCEPTION(CommonException, OSFileError) + THROW_SYS_FILE_ERROR("Failed to open lockfile", rFilename, + CommonException, OSFileError); } return false; @@ -96,8 +97,8 @@ bool NamedLock::TryAndGetLock(const std::string& rFilename, int mode) int fd = ::open(rFilename.c_str(), O_WRONLY | O_CREAT | O_TRUNC, mode); if(fd == -1) { - BOX_WARNING("Failed to open lockfile: " << rFilename); - THROW_EXCEPTION(CommonException, OSFileError) + THROW_SYS_FILE_ERROR("Failed to open lockfile", rFilename, + CommonException, OSFileError); } #ifdef HAVE_FLOCK @@ -110,7 +111,8 @@ bool NamedLock::TryAndGetLock(const std::string& rFilename, int mode) } else { - THROW_EXCEPTION(CommonException, OSFileError) + THROW_SYS_FILE_ERROR("Failed to lock lockfile with flock()", + rFilename, CommonException, OSFileError); } } #elif HAVE_DECL_F_SETLK @@ -128,7 +130,8 @@ bool NamedLock::TryAndGetLock(const std::string& rFilename, int mode) } else { - THROW_EXCEPTION(CommonException, OSFileError) + THROW_SYS_FILE_ERROR("Failed to lock lockfile with fcntl()", + rFilename, CommonException, OSFileError); } } #endif |