owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Subsonic API: better logs

Browse Source
This commit is contained in:
emeric
2019-08-04 14:33:48 +02:00
parent 882c166de9
commit d540240335
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/subsonic/SubsonicResource.cpp
+8 -7
View File
@@ -1850,6 +1850,10 @@ SubsonicResource::handleRequest(const Wt::Http::Request &request, Wt::Http::Resp
LMS_LOG(API_SUBSONIC, DEBUG) << "Handling request " << requestId << " '" << request.pathInfo() << "', continuation = " << (request.continuation() ? "true" : "false") << ", params = " << parameterMapToDebugString(request.getParameterMap()); LMS_LOG(API_SUBSONIC, DEBUG) << "Handling request " << requestId << " '" << request.pathInfo() << "', continuation = " << (request.continuation() ? "true" : "false") << ", params = " << parameterMapToDebugString(request.getParameterMap());
std::string requestPath {request.pathInfo()};
if (stringEndsWith(requestPath, ".view"))
requestPath.resize(requestPath.length() - 5);
const Wt::Http::ParameterMap& parameters {request.getParameterMap()}; const Wt::Http::ParameterMap& parameters {request.getParameterMap()};
// Optional parameters // Optional parameters
@@ -1857,9 +1861,6 @@ SubsonicResource::handleRequest(const Wt::Http::Request &request, Wt::Http::Resp
try try
{ {
std::string requestPath {request.pathInfo()};
if (stringEndsWith(requestPath, ".view"))
requestPath.resize(requestPath.length() - 5);
// Mandatory parameters // Mandatory parameters
const ClientInfo clientInfo {getClientInfo(parameters)}; const ClientInfo clientInfo {getClientInfo(parameters)};
@@ -1900,7 +1901,7 @@ SubsonicResource::handleRequest(const Wt::Http::Request &request, Wt::Http::Resp
resp.write(response.out(), format); resp.write(response.out(), format);
response.setMimeType(ResponseFormatToMimeType(format)); response.setMimeType(ResponseFormatToMimeType(format));
LMS_LOG(API_SUBSONIC, DEBUG) << "Request " << requestId << " '" << request.path() << "' handled!"; LMS_LOG(API_SUBSONIC, DEBUG) << "Request " << requestId << " '" << requestPath << "' handled!";
return; return;
} }
@@ -1927,16 +1928,16 @@ SubsonicResource::handleRequest(const Wt::Http::Request &request, Wt::Http::Resp
continuation->setData(std::move(res.continuationData)); continuation->setData(std::move(res.continuationData));
} }
LMS_LOG(API_SUBSONIC, DEBUG) << "Request " << requestId << " '" << request.path() << "' handled!"; LMS_LOG(API_SUBSONIC, DEBUG) << "Request " << requestId << " '" << requestPath << "' handled!";
return; return;
} }
LMS_LOG(API_SUBSONIC, ERROR) << "Unhandled command '" << request.path() << "'"; LMS_LOG(API_SUBSONIC, ERROR) << "Unhandled command '" << requestPath << "'";
throw Error {Error::CustomType::NotImplemented}; throw Error {Error::CustomType::NotImplemented};
} }
catch (const Error& e) catch (const Error& e)
{ {
LMS_LOG(API_SUBSONIC, ERROR) << "Error while processing request '" << request.path() << "'" LMS_LOG(API_SUBSONIC, ERROR) << "Error while processing request '" << requestPath << "'"
<< ", params = [" << parameterMapToDebugString(request.getParameterMap()) << "]" << ", params = [" << parameterMapToDebugString(request.getParameterMap()) << "]"
<< ", code = " << static_cast<int>(e.getCode()) << ", msg = '" << e.getMessage() << "'"; << ", code = " << static_cast<int>(e.getCode()) << ", msg = '" << e.getMessage() << "'";
Response resp {Response::createFailedResponse(e)}; Response resp {Response::createFailedResponse(e)};