Try to cache static resources.
Static non media file’s timestamps are hashed at compile tome so that modifying them invalidate old cache.
~~For some reason, plume-front.wasm isn’t loaded from cache, even if it contains the right headers.~~
I changed nothing and now it is? I guess I’m ok with it
~~I’ll look into adding Etag support too~~
All response made from templates and not containing a form are now Etag-cached

👍 1 ❤️ 1

igalic (Migrated from github.com) reviewed 1 year ago

👀

build.rs

												
			@@ -5,0 +13,4 @@
		
			        .spawn()
		
			        .expect("failed find command");
		
			    let sort = Command::new("sort")

Plume_migration_agent commented 1 year ago

i’d rather this wasn’t random, but deterministic

such as the file’s she256sum

trinity-1686a reviewed 1 year ago

build.rs

												
			@@ -5,0 +13,4 @@
		
			        .spawn()
		
			        .expect("failed find command");
		
			    let sort = Command::new("sort")

trinity-1686a commented 1 year ago

What is your issue with it being random? It’s fixed at compile time, so assuming a production server, which may restart but won’t recompile often, the cache will be ok. My first through was using git commit sha, but this may be unnecessary information disclosure

igalic (Migrated from github.com) reviewed 1 year ago

build.rs

												
			@@ -5,0 +13,4 @@
		
			        .spawn()
		
			        .expect("failed find command");
		
			    let sort = Command::new("sort")

Plume_migration_agent commented 1 year ago

if nothing about the code changes, the cache_id shouldn’t change either

Codecov Report

Merging #480 into master will decrease coverage by 0.31%.
The diff coverage is 0%.

@@            Coverage Diff             @@
##           master     #480      +/-   ##
==========================================
- Coverage   27.13%   26.82%   -0.32%     
==========================================
  Files          64       64              
  Lines        7337     7423      +86     
==========================================
  Hits         1991     1991              
- Misses       5346     5432      +86

elegaanz (Migrated from github.com) reviewed 1 year ago

build.rs

												
			@@ -5,0 +13,4 @@
		
			        .spawn()
		
			        .expect("failed find command");
		
			    let sort = Command::new("sort")

Plume_migration_agent commented 1 year ago

The build won’t be run again if the code didn’t changed, so the ID will not change.

elegaanz (Migrated from github.com) reviewed 1 year ago

build.rs

Plume_migration_agent commented 1 year ago

You should probably remove it from Cargo.toml too.

trinity-1686a reviewed 1 year ago

build.rs

trinity-1686a commented 1 year ago

I totally forgot about that

igalic (Migrated from github.com) reviewed 1 year ago

build.rs

												
			@@ -5,0 +13,4 @@
		
			        .spawn()
		
			        .expect("failed find command");
		
			    let sort = Command::new("sort")

Plume_migration_agent commented 1 year ago

yes, in our development environment that is true, but not for anyone building packages or container images of our software. they always start from a clean slate

igalic (Migrated from github.com) reviewed 1 year ago

👍

build.rs

												
			@@ -5,0 +13,4 @@
		
			        .spawn()
		
			        .expect("failed find command");
		
			    let sort = Command::new("sort")

Plume_migration_agent commented 1 year ago

btw, is there no way to do this in rust?

trinity-1686a reviewed 1 year ago

build.rs

												
			@@ -5,0 +13,4 @@
		
			        .spawn()
		
			        .expect("failed find command");
		
			    let sort = Command::new("sort")

trinity-1686a commented 1 year ago

I think there are plenty, but I’m lazy and it’s a build script. I prototyped using bash, so my rust code is basically bash translated (if you find it really bad, I can change that but I don’t know if it’s really useful)

igalic (Migrated from github.com) reviewed 1 year ago

build.rs

												
			@@ -5,0 +13,4 @@
		
			        .spawn()
		
			        .expect("failed find command");
		
			    let sort = Command::new("sort")

Plume_migration_agent commented 1 year ago

nah, i was just curious

elegaanz (Migrated from github.com) reviewed 1 year ago

src/template_utils.rs

												
			@@ -11,0 +37,4 @@
		
			                .merge(HtmlCt(self.0).respond_to(r)?)
		
			                .header(ETag(EntityTag::strong(etag)))
		
			                .ok()
		
			        }

Plume_migration_agent commented 1 year ago

Probably obvious, but why do we disable caching on pages with a form?

trinity-1686a reviewed 1 year ago

src/template_utils.rs

												
			@@ -11,0 +37,4 @@
		
			                .merge(HtmlCt(self.0).respond_to(r)?)
		
			                .header(ETag(EntityTag::strong(etag)))
		
			                .ok()
		
			        }

trinity-1686a commented 1 year ago

If the page contain a form, the csrf token will be cached, and may no longer match user’s cookies. As these tokens are added later by a fairing, there is no way to detect the page changed here. The other solution could be to allow caching of page and for rocket_csrf to remove ETag when appropriate

elegaanz (Migrated from github.com) approved these changes 1 year ago

👍 Thanks!

Reviewers

Plume_migration_agent approved these changes 1 year ago

The pull request has been merged as a2b2e37aa0.

Plume_migration_agent

A: Backend

C: Enhancement

S: Ready for review

No Milestone

No Assignees

2 Participants

Notifications

Due Date

No due date set.

Dependencies

This pull request currently doesn't have any dependencies.

#480 Caching

Codecov Report

Reviewers