From 84aaeb9cd1a3130f7e07d3646a89a7efe4754e66 Mon Sep 17 00:00:00 2001
From: Eric Cano <Eric.Cano@cern.ch>
Date: Wed, 2 Aug 2017 18:39:12 +0200
Subject: [PATCH] Moved archive queue address resetting in
Helpers::getLockedAndFetchedQueue<ArchiveQueue>().
It was used in logging.
---
objectstore/Helpers.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/objectstore/Helpers.cpp b/objectstore/Helpers.cpp
index f66237dc70..242274acd2 100644
--- a/objectstore/Helpers.cpp
+++ b/objectstore/Helpers.cpp
@@ -101,7 +101,6 @@ void Helpers::getLockedAndFetchedQueue<ArchiveQueue>(ArchiveQueue& archiveQueue,
// We also need to make sure the lock on the queue is released (it is in
// an object and hence not scoped).
if (archiveQueueLock.isLocked()) archiveQueueLock.release();
- archiveQueue.resetAddress();
log::ScopedParamContainer params(lc);
params.add("attemptNb", i+1)
.add("exceptionMessage", ex.getMessageValue())
@@ -115,6 +114,7 @@ void Helpers::getLockedAndFetchedQueue<ArchiveQueue>(ArchiveQueue& archiveQueue,
.add("queueLockTime", queueLockTime)
.add("queueFetchTime", queueFetchTime);
lc.log(log::ERR, "In Helpers::getLockedAndFetchedQueue<ArchiveQueue>(): failed to fetch an existing queue. Retrying.");
+ archiveQueue.resetAddress();
continue;
} catch (...) {
// Also release the lock if needed here.
--
GitLab