aboutsummaryrefslogtreecommitdiff
path: root/zenserver/cache/structuredcachestore.cpp
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2021-08-24 21:01:47 +0200
committerStefan Boberg <[email protected]>2021-08-24 21:01:47 +0200
commitc08d36f73962354673e59cb30d2b123df13ea4ce (patch)
tree8f0d8972699978696d58ca336e64c90e71a4bac4 /zenserver/cache/structuredcachestore.cpp
parentChanged direct spdlog -> zencore/logging.h (diff)
downloadzen-c08d36f73962354673e59cb30d2b123df13ea4ce.tar.xz
zen-c08d36f73962354673e59cb30d2b123df13ea4ce.zip
Fixed up drop logic (short circuiting fail!)
Diffstat (limited to 'zenserver/cache/structuredcachestore.cpp')
-rw-r--r--zenserver/cache/structuredcachestore.cpp8
1 files changed, 5 insertions, 3 deletions
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