refactor hub notifications (#888)

* refactor hub callbacks
* improve http responses

1 files changed, 21 insertions, 7 deletions

diff --git a/src/zenserver/hub/httphubservice.cpp b/src/zenserver/hub/httphubservice.cpp
index a91e36128..34f4294e4 100644
--- a/src/zenserver/hub/httphubservice.cpp
+++ b/src/zenserver/hub/httphubservice.cpp
@@ -269,9 +269,6 @@ HttpHubService::HandleModuleGet(HttpServerRequest& Request, std::string_view Mod
 		return;
 	}
 
-	// TODO: A separate http request for the modules/{moduleid}/deprovision endpoint can be called and deprovision the instance leaving us
-	// with a dangling pointer...
-
 	CbObjectWriter Obj;
 	Obj << "moduleId" << ModuleId;
 	Obj << "state" << ToString(InstanceInfo.State);
@@ -288,12 +285,29 @@ HttpHubService::HandleModuleDelete(HttpServerRequest& Request, std::string_view
 		return;
 	}
 
-	if (InstanceInfo.State == HubInstanceState::Provisioned)
+	if (InstanceInfo.State == HubInstanceState::Provisioned || InstanceInfo.State == HubInstanceState::Hibernated ||
+		InstanceInfo.State == HubInstanceState::Crashed)
 	{
-		std::string Reason;
-		if (!m_Hub.Deprovision(std::string(ModuleId), Reason))
+		std::string FailureReason;
+		try
+		{
+			if (!m_Hub.Deprovision(std::string(ModuleId), FailureReason))
+			{
+				if (FailureReason.empty())
+				{
+					Request.WriteResponse(HttpResponseCode::NotFound);
+				}
+				else
+				{
+					Request.WriteResponse(HttpResponseCode::BadRequest, HttpContentType::kText, FailureReason);
+				}
+				return;
+			}
+		}
+		catch (const std::exception& Ex)
 		{
-			Request.WriteResponse(HttpResponseCode::InternalServerError, HttpContentType::kText, Reason);
+			ZEN_ERROR("Exception while deprovisioning module '{}': {}", ModuleId, Ex.what());
+			Request.WriteResponse(HttpResponseCode::InternalServerError, HttpContentType::kText, Ex.what());
 			return;
 		}
 	}