oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

db/update/InotifyQueue: check for ACK_ERROR_UPDATE_ALREADY

Browse Source 
Since commit cc64c715a2, UpdateService::Enqueue() throws
ProtocolError(ACK_ERROR_UPDATE_ALREADY) instead of returning 0.
This commit is contained in:
Max Kellermann 2018-12-28 14:02:41 +01:00
parent 3c4ed9cbe3
commit 1c7bd7d5c4
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/db/update/InotifyQueue.cxx
View File

@ -21,6 +21,7 @@
#include "InotifyDomain.hxx" #include "InotifyDomain.hxx"
#include "Service.hxx" #include "Service.hxx"
#include "Log.hxx" #include "Log.hxx"
#include "protocol/Ack.hxx" // for class ProtocolError
#include "util/StringCompare.hxx" #include "util/StringCompare.hxx"
/** /**
@ -39,8 +40,18 @@ InotifyQueue::OnDelay() noexcept
while (!queue.empty()) { while (!queue.empty()) {
const char *uri_utf8 = queue.front().c_str(); const char *uri_utf8 = queue.front().c_str();
try {
try { try {
id = update.Enqueue(uri_utf8, false); id = update.Enqueue(uri_utf8, false);
} catch (const ProtocolError &e) {
if (e.GetCode() == ACK_ERROR_UPDATE_ALREADY) {
/* retry later */
delay_event.Schedule(INOTIFY_UPDATE_DELAY);
return;
}
throw;
}
} catch (...) { } catch (...) {
FormatError(std::current_exception(), FormatError(std::current_exception(),
"Failed to enqueue '%s'", uri_utf8); "Failed to enqueue '%s'", uri_utf8);
@ -48,12 +59,6 @@ InotifyQueue::OnDelay() noexcept
continue; continue;
} }
if (id == 0) {
/* retry later */
delay_event.Schedule(INOTIFY_UPDATE_DELAY);
return;
}
FormatDebug(inotify_domain, "updating '%s' job=%u", FormatDebug(inotify_domain, "updating '%s' job=%u",
uri_utf8, id); uri_utf8, id);