Add store/forward cache capabilities #4
Conversation
Includes merge of all upstream changes through release as Adobe Open Source.
Includes merge of all upstream changes through release as Adobe Open Source.
All the bones are there, but apparently you can't use an enum as a configuration value.
So this required a bunch of changes in secure.rs: - move to native-tls rather than rustssl, which was broken on Mac at the version we were using - move to latest versions of tokio (now at 1.0) and hyper and related packages - use pkcs12 certificate form (required by native-tls and better because it's a single package) - rework the socket stream stuff to be compatible with latest tokio and hyper Unfortunately, it looks like sqlx is not compatible with the latest tokio. So that's the next thing to work on.
Needed until I get SQLX working.
# Conflicts: # Cargo.lock # Cargo.toml # src/proxy/secure.rs
# Conflicts: # Cargo.lock # Cargo.toml # src/cache.rs # src/cli.rs # src/main.rs # src/proxy.rs # src/res/defaults.toml # src/res/template.toml # src/settings.rs
|
@adorton-adobe this is FYI about a lot of work on caching I did over the break. I still need to get sqlx working the latest version of tokio before I can fully test the cache. I should be done with this in about a week. Then I would be happy to turn it over to one of your folks. |
I found a wonderful open source developer who had a fork of sqlx that he had ported to the latest tokio and native-tls. I got all three cache modes working. There's still one problem when there is a cache miss in store mode: the 502 response I am using to indicate I can't reach the server seems to crash the client. I have to find out from the server people what I should be returning in that case.
The code wasn't formatting correctly on Linux due to the width_heuristics option.
|
Hey, @adorton-adobe, it's definitely time to review this PR, because I believe it works great! |
|
I'm attaching a working config file and certificate to make it easier to test. Just add these lines to your local host file: and it should work fine. You can control the mode with the --mode command line argument, as in |
|
Thanks. I started looking at it yesterday. |
|
One other thing I forgot to ask - have you made any updates to the User Guide yet? If not, I will plan to update it to cover this new functionality. |
No, I hate doing docs, I'm slow at it and overthink them terribly. If you would be willing that would be great. |
1. Updated to use captive repo version of updated sqlx while waiting for official release. 2. Added explicit tokio-stream dependency to fix dependency conflict between hyper and updated sqlx. 3. Integrated deactivation code fix from code review. 4. Tested deactivation and fixed schema error in deactivations table NOTE: You must delete any prior databases, because the db schema has changed.
|
@adorton-adobe I've integrated your requested fixes, and I've tested deactivation in cache, store, and forward modes. I think we're ready to merge unless your testing reveals other problems. |
Summary
Testing Steps
Fixes #3