oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

command/{Player,Error}: extract messages from nested exceptions

Browse Source
This commit is contained in:
Max Kellermann
2016-12-29 14:28:03 +01:00
parent 256f40d4f5
commit 52652cb609
5 changed files with 100 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/command/CommandError.cxx
View File

@@ -23,6 +23,7 @@
#include "db/DatabaseError.hxx"
#include "client/Response.hxx"
#include "Log.hxx"
#include "util/Exception.hxx"
#include <system_error>
@@ -122,12 +123,6 @@ ToAck(std::exception_ptr ep)
void
PrintError(Response &r, std::exception_ptr ep)
{
try {
std::rethrow_exception(ep);
} catch (const std::exception &e) {
LogError(e);
r.Error(ToAck(ep), e.what());
} catch (...) {
r.Error(ACK_ERROR_UNKNOWN, "Unknown error");
}
LogError(ep);
r.Error(ToAck(ep), FullMessage(ep).c_str());
}

6
src/command/PlayerCommands.cxx
View File

@@ -31,6 +31,7 @@
#include "Idle.hxx"
#include "AudioFormat.hxx"
#include "util/ScopeExit.hxx"
#include "util/Exception.hxx"
#ifdef ENABLE_DATABASE
#include "db/update/Service.hxx"
@@ -192,10 +193,9 @@ handle_status(Client &client, gcc_unused Request args, Response &r)
try {
client.player_control.LockCheckRethrowError();
} catch (const std::exception &e) {
r.Format(COMMAND_STATUS_ERROR ": %s\n", e.what());
} catch (...) {
r.Format(COMMAND_STATUS_ERROR ": unknown\n");
r.Format(COMMAND_STATUS_ERROR ": %s\n",
FullMessage(std::current_exception()).c_str());
}
song = playlist.GetNextPosition();