From 09ea0be2f03a7c4f31e94f25a047fcfb16b6bfe7 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Thu, 11 Jul 2019 21:47:52 -0700
Subject: [PATCH] modules/client/rooms/invite: Improve error reporting.

---
 modules/client/rooms/invite.cc | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/modules/client/rooms/invite.cc b/modules/client/rooms/invite.cc
index 8b8e5da46..778c4dd56 100644
--- a/modules/client/rooms/invite.cc
+++ b/modules/client/rooms/invite.cc
@@ -167,11 +167,24 @@ try
 		room_id, event_id, proto, buf, std::move(opts)
 	};
 
-	request.wait(seconds(10)); //TODO: conf
-	const http::code &rcode
+	http::code rcode; try
 	{
-		request.get()
-	};
+		request.wait(seconds(10)); //TODO: conf
+		rcode = request.get();
+	}
+	catch(const http::error &e)
+	{
+		log::error
+		{
+			"Invite %s to %s :%s :%s",
+			string_view{event.event_id},
+			string(opts.remote),
+			e.what(),
+			e.content,
+		};
+
+		throw;
+	}
 
 	const json::object &response
 	{
@@ -205,14 +218,13 @@ try
 	m::vm::eval(revent, vmopts);
 	return revent.event_id;
 }
-catch(const http::error &e)
+catch(const std::exception &e)
 {
 	log::error
 	{
-		"Contacting remote for invite %s :%s :%s",
+		"Invite remote %s :%s",
 		string_view{event.event_id},
 		e.what(),
-		e.content,
 	};
 
 	throw;