misc fixes brought over from sb/proto (#759)

* `RwLock::WithSharedLock` and `RwLock::WithExclusiveLock` can now return a value (which is returned by the passed function)
* Comma-separated logger specification now correctly deals with commas
* `GetSystemMetrics` properly accounts for cores
* cpr response formatter passes arguments in the right order
* `HttpServerRequest::SetLogRequest` can be used to selectively log HTTP requests

2 files changed, 17 insertions, 4 deletions

diff --git a/src/zenhttp/include/zenhttp/cprutils.h b/src/zenhttp/include/zenhttp/cprutils.h
index a988346e0..c252a5d99 100644
--- a/src/zenhttp/include/zenhttp/cprutils.h
+++ b/src/zenhttp/include/zenhttp/cprutils.h
@@ -66,10 +66,10 @@ struct fmt::formatter<cpr::Response>
 						Response.url.str(),
 						Response.status_code,
 						zen::ToString(zen::HttpResponseCode(Response.status_code)),
+						Response.reason,
 						Response.uploaded_bytes,
 						Response.downloaded_bytes,
 						NiceResponseTime.c_str(),
-						Response.reason,
 						Json);
 				}
 				else
@@ -82,10 +82,10 @@ struct fmt::formatter<cpr::Response>
 						Response.url.str(),
 						Response.status_code,
 						zen::ToString(zen::HttpResponseCode(Response.status_code)),
+						Response.reason,
 						Response.uploaded_bytes,
 						Response.downloaded_bytes,
 						NiceResponseTime.c_str(),
-						Response.reason,
 						Body.GetText());
 				}
 			}
diff --git a/src/zenhttp/include/zenhttp/httpserver.h b/src/zenhttp/include/zenhttp/httpserver.h
index 60f6bc9f2..cbac06cb6 100644
--- a/src/zenhttp/include/zenhttp/httpserver.h
+++ b/src/zenhttp/include/zenhttp/httpserver.h
@@ -39,7 +39,7 @@ public:
 	// Synchronous operations
 
 	[[nodiscard]] inline std::string_view RelativeUri() const { return m_Uri; }	 // Returns URI without service prefix
-	[[nodiscard]] std::string_view		  RelativeUriWithExtension() const { return m_UriWithExtension; }
+	[[nodiscard]] inline std::string_view RelativeUriWithExtension() const { return m_UriWithExtension; }
 	[[nodiscard]] inline std::string_view QueryString() const { return m_QueryString; }
 	[[nodiscard]] inline HttpService&	  Service() const { return m_Service; }
 
@@ -81,6 +81,18 @@ public:
 	inline bool IsHandled() const { return !!(m_Flags & kIsHandled); }
 	inline bool SuppressBody() const { return !!(m_Flags & kSuppressBody); }
 	inline void SetSuppressResponseBody() { m_Flags |= kSuppressBody; }
+	inline void SetLogRequest(bool ShouldLog)
+	{
+		if (ShouldLog)
+		{
+			m_Flags |= kLogRequest;
+		}
+		else
+		{
+			m_Flags &= ~kLogRequest;
+		}
+	}
+	inline bool ShouldLogRequest() const { return !!(m_Flags & kLogRequest); }
 
 	/** Read POST/PUT payload for request body, which is always available without delay
 	 */
@@ -119,6 +131,7 @@ protected:
 		kSuppressBody  = 1 << 1,
 		kHaveRequestId = 1 << 2,
 		kHaveSessionId = 1 << 3,
+		kLogRequest	   = 1 << 4,
 	};
 
 	mutable uint32_t m_Flags = 0;
@@ -254,7 +267,7 @@ public:
 	inline HttpServerRequest& ServerRequest() { return m_HttpRequest; }
 
 private:
-	HttpRouterRequest(HttpServerRequest& Request) : m_HttpRequest(Request) {}
+	explicit HttpRouterRequest(HttpServerRequest& Request) : m_HttpRequest(Request) {}
 	~HttpRouterRequest() = default;
 
 	HttpRouterRequest(const HttpRouterRequest&) = delete;