From f01eb2f95d0030b067d9226a1ef0ce32e54ce909 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 23 Jan 2017 18:55:16 +0100 Subject: [PATCH] db/proxy: improve Connect() error message --- src/db/plugins/ProxyDatabasePlugin.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/db/plugins/ProxyDatabasePlugin.cxx b/src/db/plugins/ProxyDatabasePlugin.cxx index f84645bec..983c0a704 100644 --- a/src/db/plugins/ProxyDatabasePlugin.cxx +++ b/src/db/plugins/ProxyDatabasePlugin.cxx @@ -34,6 +34,7 @@ #include "tag/TagBuilder.hxx" #include "tag/Tag.hxx" #include "util/ScopeExit.hxx" +#include "util/RuntimeError.hxx" #include "protocol/Ack.hxx" #include "event/SocketMonitor.hxx" #include "event/IdleMonitor.hxx" @@ -371,7 +372,10 @@ ProxyDatabase::Connect() mpd_connection_free(connection); connection = nullptr; - throw; + std::throw_with_nested(host.empty() + ? std::runtime_error("Failed to connect to remote MPD") + : FormatRuntimeError("Failed to connect to remote MPD '%s'", + host.c_str())); } #if LIBMPDCLIENT_CHECK_VERSION(2, 10, 0)