2 files changed, 29 insertions, 9 deletions
diff --git a/src/zenserver/storage/workspaces/httpworkspaces.cpp b/src/zenserver/storage/workspaces/httpworkspaces.cpp
index dc4cc7e69..12e7bae73 100644
--- a/src/zenserver/storage/workspaces/httpworkspaces.cpp
+++ b/src/zenserver/storage/workspaces/httpworkspaces.cpp
@@ -111,9 +111,17 @@ HttpWorkspacesService::HandleRequest(HttpServerRequest& Request)
 }
 
 void
+HttpWorkspacesService::HandleStatusRequest(HttpServerRequest& Request)
+{
+	ZEN_TRACE_CPU("HttpWorkspacesService::Status");
+	CbObjectWriter Cbo;
+	Cbo << "ok" << true;
+	Request.WriteResponse(HttpResponseCode::OK, Cbo.Save());
+}
+
+void
 HttpWorkspacesService::HandleStatsRequest(HttpServerRequest& HttpReq)
 {
-	ZEN_TRACE_CPU("WorkspacesService::Stats");
 	CbObjectWriter Cbo;
 
 	EmitSnapshot("requests", m_HttpRequests, Cbo);
@@ -150,16 +158,26 @@ HttpWorkspacesService::HandleStatsRequest(HttpServerRequest& HttpReq)
 	}
 	Cbo.EndObject();
 
-	return HttpReq.WriteResponse(HttpResponseCode::OK, Cbo.Save());
+	HttpReq.WriteResponse(HttpResponseCode::OK, Cbo.Save());
 }
 
-void
-HttpWorkspacesService::HandleStatusRequest(HttpServerRequest& Request)
+CbObject
+HttpWorkspacesService::CollectStats()
 {
-	ZEN_TRACE_CPU("HttpWorkspacesService::Status");
+	ZEN_TRACE_CPU("HttpWorkspacesService::Stats");
 	CbObjectWriter Cbo;
-	Cbo << "ok" << true;
-	Request.WriteResponse(HttpResponseCode::OK, Cbo.Save());
+
+	EmitSnapshot("requests", m_HttpRequests, Cbo);
+
+	Cbo << "workspaces" << m_Workspaces.GetWorkspaces().size();
+
+	return Cbo.Save();
+}
+
+uint64_t
+HttpWorkspacesService::GetActivityCounter()
+{
+	return m_HttpRequests.Count();
 }
 
 void
diff --git a/src/zenserver/storage/workspaces/httpworkspaces.h b/src/zenserver/storage/workspaces/httpworkspaces.h
index 888a34b4d..4af1316f8 100644
--- a/src/zenserver/storage/workspaces/httpworkspaces.h
+++ b/src/zenserver/storage/workspaces/httpworkspaces.h
@@ -29,8 +29,10 @@ public:
 	virtual const char* BaseUri() const override;
 	virtual void		HandleRequest(HttpServerRequest& Request) override;
 
-	virtual void HandleStatsRequest(HttpServerRequest& Request) override;
-	virtual void HandleStatusRequest(HttpServerRequest& Request) override;
+	virtual void	 HandleStatusRequest(HttpServerRequest& Request) override;
+	virtual void	 HandleStatsRequest(HttpServerRequest& Request) override;
+	virtual CbObject CollectStats() override;
+	virtual uint64_t GetActivityCounter() override;
 
 private:
 	struct WorkspacesStats