From c08d36f73962354673e59cb30d2b123df13ea4ce Mon Sep 17 00:00:00 2001 From: Stefan Boberg Date: Tue, 24 Aug 2021 21:01:47 +0200 Subject: Fixed up drop logic (short circuiting fail!) --- zenserver/cache/structuredcachestore.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'zenserver/cache/structuredcachestore.cpp') diff --git a/zenserver/cache/structuredcachestore.cpp b/zenserver/cache/structuredcachestore.cpp index c0584aac3..73a72175c 100644 --- a/zenserver/cache/structuredcachestore.cpp +++ b/zenserver/cache/structuredcachestore.cpp @@ -88,11 +88,13 @@ ZenCacheStore::DropBucket(std::string_view Bucket) // TODO: should ensure this is done atomically across all layers - const bool WasDropped = m_MemLayer.DropBucket(Bucket) || m_DiskLayer.DropBucket(Bucket); + const bool MemDropped = m_MemLayer.DropBucket(Bucket); + const bool DiskDropped = m_DiskLayer.DropBucket(Bucket); + const bool AnyDropped = MemDropped || DiskDropped; - spdlog::info("bucket '{}' was {}", Bucket, WasDropped ? "dropped" : "not found"); + spdlog::info("bucket '{}' was {}", Bucket, AnyDropped ? "dropped" : "not found"); - return WasDropped; + return AnyDropped; } void -- cgit v1.2.3