chore: rename cache2

timzaak · timzaak · commit 8ab30ee0b994 · 2022-04-12T12:33:32.000+08:00
diff --git a/server/src/service.rs b/server/src/service.rs
@@ -11,7 +11,7 @@ use warp::fs::Conditionals;
 use crate::cors::{cors_resp, resp_cors_request, Validated};
 use crate::DomainStorage;
 
-use crate::static_file_filter::{cache_or_file_reply, get_cache_file2};
+use crate::static_file_filter::{cache_or_file_reply, get_cache_file};
 
 
 pub struct ServiceConfig {
@@ -60,7 +60,7 @@ pub async fn create_service(req: Request<Body>, service_config: Arc<ServiceConfi
         }
         // static file
 
-        let mut resp = match get_cache_file2(req.uri().path(), host, domain_storage).await {
+        let mut resp = match get_cache_file(req.uri().path(), host, domain_storage).await {
             Ok(item) => {
                 let headers = req.headers();
                 let conditionals = Conditionals {
diff --git a/server/src/static_file_filter.rs b/server/src/static_file_filter.rs
@@ -249,7 +249,7 @@ fn cache_item_to_response_header(
     }
 }
 
-pub async fn get_cache_file2(tail:&str, host:&str, domain_storage:Arc<DomainStorage>) -> Result<(String, Arc<CacheItem>), Response<Body>> {
+pub async fn get_cache_file(tail:&str, host:&str, domain_storage:Arc<DomainStorage>) -> Result<(String, Arc<CacheItem>), Response<Body>> {
     let key = sanitize_path(tail).map(|s| {
         if s == "/" || s.is_empty() {
             "index.html".to_owned()

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ fn cache_item_to_response_header(`
`249`	`249`	`}`
`250`	`250`	`}`
`251`	`251`
`252`		`-pub async fn get_cache_file2(tail:&str, host:&str, domain_storage:Arc<DomainStorage>) -> Result<(String, Arc<CacheItem>), Response<Body>> {`
	`252`	`+pub async fn get_cache_file(tail:&str, host:&str, domain_storage:Arc<DomainStorage>) -> Result<(String, Arc<CacheItem>), Response<Body>> {`
`253`	`253`	`let key = sanitize_path(tail).map(\|s\| {`
`254`	`254`	`if s == "/" \|\| s.is_empty() {`
`255`	`255`	`"index.html".to_owned()`