was/Lease: return PutAction

This will be important for the Stock-owned Control instances.
CM4all · Jan 18, 2025 · 4a2d871 · 4a2d871
1 parent b09c435
commit 4a2d871
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 15 deletions.
diff --git a/src/was/Lease.hxx b/src/was/Lease.hxx
@@ -10,6 +10,6 @@
 
 class WasLease {
 public:
-	virtual void ReleaseWas(PutAction action) noexcept = 0;
-	virtual void ReleaseWasStop(uint_least64_t input_received) noexcept = 0;
+	virtual PutAction ReleaseWas(PutAction action) noexcept = 0;
+	virtual PutAction ReleaseWasStop(uint_least64_t input_received) noexcept = 0;
 };
diff --git a/src/was/SLease.cxx b/src/was/SLease.cxx
@@ -5,17 +5,19 @@
 #include "SLease.hxx"
 #include "SConnection.hxx"
 
-void
+PutAction
 WasStockLease::ReleaseWas(PutAction action) noexcept
 {
-	connection.Put(action);
+	action = connection.Put(action);
 	Destroy();
+	return action;
 }
 
-void
+PutAction
 WasStockLease::ReleaseWasStop(uint64_t input_received) noexcept
 {
 	connection.Stop(input_received);
-	connection.Put(PutAction::REUSE);
+	PutAction action = connection.Put(PutAction::REUSE);
 	Destroy();
+	return action;
 }
diff --git a/src/was/SLease.hxx b/src/was/SLease.hxx
@@ -18,8 +18,8 @@ public:
 	WasStockLease(const WasStockLease &) = delete;
 	WasStockLease &operator=(const WasStockLease &) = delete;
 
-	void ReleaseWas(PutAction action) noexcept override;
-	void ReleaseWasStop(uint_least64_t input_received) noexcept override;
+	PutAction ReleaseWas(PutAction action) noexcept override;
+	PutAction ReleaseWasStop(uint_least64_t input_received) noexcept override;
 
 private:
 	void Destroy() noexcept {

diff --git a/test/run_was.cxx b/test/run_was.cxx
@@ -61,13 +61,14 @@ struct Context final
 	}
 
 	/* virtual methods from class Lease */
-	void ReleaseWas([[maybe_unused]] PutAction action) noexcept override {
+	PutAction ReleaseWas([[maybe_unused]] PutAction action) noexcept override {
 		process.handle.reset();
 		process.Close();
+		return PutAction::DESTROY;
 	}
 
-	void ReleaseWasStop([[maybe_unused]] uint_least64_t input_received) noexcept override {
-		ReleaseWas(PutAction::DESTROY);
+	PutAction ReleaseWasStop([[maybe_unused]] uint_least64_t input_received) noexcept override {
+		return ReleaseWas(PutAction::DESTROY);
 	}
 
 	/* virtual methods from class HttpResponseHandler */

diff --git a/test/t_was_client.cxx b/test/t_was_client.cxx
@@ -379,12 +379,12 @@ class WasConnection final
 	}
 
 	/* virtual methods from class WasLease */
-	void ReleaseWas(PutAction action) noexcept override {
-		lease->ReleaseLease(action);
+	PutAction ReleaseWas(PutAction action) noexcept override {
+		return lease->ReleaseLease(action);
 	}
 
-	void ReleaseWasStop(uint_least64_t) noexcept override {
-		ReleaseWas(PutAction::DESTROY);
+	PutAction ReleaseWasStop(uint_least64_t) noexcept override {
+		return ReleaseWas(PutAction::DESTROY);
 	}
 
 	/* virtual methods from class WasControlHandler */