refactor: replace FileCache with FileCacheEx in HttpHandler and HttpServer

Author: Yundi339

http/server/HttpHandler.cpp

@@ -608,8 +608,8 @@ int HttpHandler::defaultStaticHandler() {
         return status_code;
     }
 
-    // FileCache
-    FileCache::OpenParam param;
+    // FileCacheEx
+    FileCacheEx::OpenParam param;
     param.max_read = service->max_file_cache_size;
     param.need_read = !(req->method == HTTP_HEAD || has_range);
     param.path = req_path;
@@ -689,7 +689,7 @@ int HttpHandler::defaultErrorHandler() {
         std::string filepath = service->document_root + '/' + service->error_page;
         if (files) {
             // cache and load error page
-            FileCache::OpenParam param;
+            FileCacheEx::OpenParam param;
             fc = files->Open(filepath.c_str(), &param);
         }
     }
@@ -798,7 +798,7 @@ int HttpHandler::GetSendData(char** data, size_t* len) {
             }
             // File service
             if (fc) {
-                // FileCache
+                // FileCacheEx
                 // NOTE: no copy filebuf, more efficient
                 header = pResp->Dump(true, false);
                 fc->prepend_header(header.c_str(), header.size());
@@ -842,8 +842,8 @@ int HttpHandler::GetSendData(char** data, size_t* len) {
         }
         case SEND_DONE:
         {
-            // NOTE: remove file cache if > FILE_CACHE_MAX_SIZE
-            if (fc && fc->filebuf.len > FILE_CACHE_MAX_SIZE) {
+            // NOTE: remove file cache if > max_file_size
+            if (fc && fc->filebuf.len > files->GetMaxFileSize()) {
                 files->Close(fc->filepath.c_str());
             }
             fc = NULL;

http/server/HttpHandler.h

@@ -3,7 +3,7 @@
 
 #include "HttpService.h"
 #include "HttpParser.h"
-#include "FileCache.h"
+#include "FileCacheEx.h"
 
 #include "WebSocketServer.h"
 #include "WebSocketParser.h"
@@ -71,8 +71,8 @@ class HttpHandler {
     uint64_t                last_recv_pong_time;
 
     // for sendfile
-    FileCache               *files;
-    file_cache_ptr          fc;     // cache small file
+    FileCacheEx             *files;
+    file_cache_ex_ptr       fc;     // cache small file
     struct LargeFile : public HFile {
         HBuf        buf;
         uint64_t    timer;

http/server/HttpServer.cpp

@@ -19,7 +19,7 @@ struct HttpServerPrivdata {
     std::vector<hthread_t>          threads;
     std::mutex                      mutex_;
     std::shared_ptr<HttpService>    service;
-    FileCache                       filecache;
+    FileCacheEx                     filecache;
 };
 
 static void on_recv(hio_t* io, void* buf, int readbytes) {
@@ -86,7 +86,7 @@ static void on_accept(hio_t* io) {
     handler->service = service;
     // websocket service
     handler->ws_service = server->ws;
-    // FileCache
+    // FileCacheEx
     HttpServerPrivdata* privdata = (HttpServerPrivdata*)server->privdata;
     handler->files = &privdata->filecache;
     hevent_set_userdata(io, handler);
@@ -132,14 +132,14 @@ static void loop_thread(void* userdata) {
             service->Static("/", service->document_root.c_str());
         }
 
-        // FileCache
-        FileCache* filecache = &privdata->filecache;
+        // FileCacheEx
+        FileCacheEx* filecache = &privdata->filecache;
         filecache->stat_interval = service->file_cache_stat_interval;
         filecache->expired_time = service->file_cache_expired_time;
         if (filecache->expired_time > 0) {
             // NOTE: add timer to remove expired file cache
             htimer_t* timer = htimer_add(hloop, [](htimer_t* timer) {
-                FileCache* filecache = (FileCache*)hevent_userdata(timer);
+                FileCacheEx* filecache = (FileCacheEx*)hevent_userdata(timer);
                 filecache->RemoveExpiredFileCache();
             },  filecache->expired_time * 1000);
             hevent_set_userdata(timer, filecache);