Rooba
/
drogon
mirror of https://github.com/drogonframework/drogon.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Modify HttpAppFrameworkImpl for static files cache

This commit is contained in:
antao 2018-10-15 14:01:18 +08:00
parent b539b5231c
commit 0787f63922
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/src/HttpAppFrameworkImpl.cc
View File

@ -729,6 +729,7 @@ void HttpAppFrameworkImpl::onAsyncRequest(const HttpRequestPtr &req, const std::
//make a copy
auto newCachedResp = std::make_shared<HttpResponseImpl>(*std::dynamic_pointer_cast<HttpResponseImpl>(cachedResp));
newCachedResp->addCookie("JSESSIONID", session_id);
newCachedResp->setExpiredTime(-1);
callback(newCachedResp);
return;
}
@ -737,9 +738,6 @@ void HttpAppFrameworkImpl::onAsyncRequest(const HttpRequestPtr &req, const std::
}
std::shared_ptr<HttpResponseImpl> resp = std::make_shared<HttpResponseImpl>();
if (needSetJsessionid)
resp->addCookie("JSESSIONID", session_id);
// pick a Content-Type for the file
if (filetype == "html")
resp->setContentTypeCode(CT_TEXT_HTML);
@ -783,6 +781,19 @@ void HttpAppFrameworkImpl::onAsyncRequest(const HttpRequestPtr &req, const std::
resp->setContentTypeCode(CT_APPLICATION_OCTET_STREAM);
readSendFile(filePath, req, resp);
if (needSetJsessionid)
{
auto newCachedResp = resp;
if (resp->expiredTime() >= 0)
{
//make a copy
newCachedResp = std::make_shared<HttpResponseImpl>(*std::dynamic_pointer_cast<HttpResponseImpl>(resp));
newCachedResp->setExpiredTime(-1);
}
newCachedResp->addCookie("JSESSIONID", session_id);
callback(newCachedResp);
return;
}
callback(resp);
return;
}
@ -1060,14 +1071,18 @@ void HttpAppFrameworkImpl::readSendFile(const std::string &filePath, const HttpR
resp->setStatusCode(HttpResponse::k200OK);
//cache the response for 5 seconds by default
resp->setExpiredTime(_staticFilesCacheTime);
_responseCacheMap->insert(filePath, resp, resp->expiredTime(), [=]() {
std::lock_guard<std::mutex> guard(_staticFilesCacheMutex);
_staticFilesCache.erase(filePath);
});
if (_staticFilesCacheTime >= 0)
{
std::lock_guard<std::mutex> guard(_staticFilesCacheMutex);
_staticFilesCache[filePath] = resp;
resp->setExpiredTime(_staticFilesCacheTime);
_responseCacheMap->insert(filePath, resp, resp->expiredTime(), [=]() {
std::lock_guard<std::mutex> guard(_staticFilesCacheMutex);
_staticFilesCache.erase(filePath);
});
{
std::lock_guard<std::mutex> guard(_staticFilesCacheMutex);
_staticFilesCache[filePath] = resp;
}
}
}