command/AllCommands: catch and report std::exception

This commit is contained in:
Max Kellermann 2015-12-15 23:17:34 +01:00
parent 3092e5a8a5
commit 8f93c36466
3 changed files with 33 additions and 4 deletions

View File

@ -19,6 +19,7 @@
#include "config.h"
#include "AllCommands.hxx"
#include "CommandError.hxx"
#include "Request.hxx"
#include "QueueCommands.hxx"
#include "TagCommands.hxx"
@ -411,9 +412,14 @@ command_process(Client &client, unsigned num, char *line)
command_checked_lookup(r, client.GetPermission(),
cmd_name, args);
CommandResult ret = cmd
? cmd->handler(client, args, r)
: CommandResult::ERROR;
try {
CommandResult ret = cmd
? cmd->handler(client, args, r)
: CommandResult::ERROR;
return ret;
return ret;
} catch (const std::exception &e) {
PrintError(r, e);
return CommandResult::ERROR;
}
}

View File

@ -25,6 +25,8 @@
#include "util/Error.hxx"
#include "Log.hxx"
#include <system_error>
#include <assert.h>
#include <string.h>
#include <errno.h>
@ -155,3 +157,17 @@ print_error(Response &r, const Error &error)
r.Error(ToAck(error), error.GetMessage());
return CommandResult::ERROR;
}
void
PrintError(Response &r, const std::exception &e)
{
LogError(e);
try {
throw e;
} catch (const std::system_error &) {
r.Error(ACK_ERROR_SYSTEM, e.what());
} catch (...) {
r.Error(ACK_ERROR_UNKNOWN, e.what());
}
}

View File

@ -23,6 +23,10 @@
#include "CommandResult.hxx"
#include "PlaylistError.hxx"
namespace std {
class exception;
}
class Response;
class Error;
@ -35,4 +39,7 @@ print_playlist_result(Response &r, PlaylistResult result);
CommandResult
print_error(Response &r, const Error &error);
void
PrintError(Response &r, const std::exception &e);
#endif