Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test out OWS GetMap/GetTile caching in DEA Dev OWS #1138

Merged
merged 2 commits into from
Jan 31, 2023
+13 −1
Merged

Test out OWS GetMap/GetTile caching in DEA Dev OWS #1138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14d21db
Improve WMS Caching
omad Jan 30, 2023
5687d58
Cache OWS GetCaps requests in Dev
omad Jan 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions dev/services/wms/ows_refactored/ows_reslim_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
# external caches (e.g Cloudfront)

dataset_cache_rules = [
{
"min_datasets": 1,
"max_age": 60 * 60,
},
{
"min_datasets": 5,
"max_age": 60 * 60 * 24,
Expand Down
4 changes: 4 additions & 0 deletions dev/services/wms/ows_refactored/ows_root_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@
"s3_aws_zone": "ap-southeast-2",
"max_width": 512,
"max_height": 512,
# Allow the WMS/WMTS GetCapabilities responses to be cached for 1 hour
"caps_cache_maxage": 3600,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general I would prefer something like 60 * 60 - but 3600 should be familiar enough as the number of seconds in an hour.

}, # END OF wms SECTION
"wmts": {
# Config for WMTS service, for all products/layers
Expand Down Expand Up @@ -123,6 +125,8 @@
"wcs": {
# Config for WCS service, for all products/coverages
"default_geographic_CRS": "EPSG:4326",
"caps_cache_maxage": 3600,
"default_desc_cache_maxage": 3600,
"formats": {
"GeoTIFF": {
"renderers": {
Expand Down
6 changes: 5 additions & 1 deletion prod/services/wms/ows_refactored/ows_reslim_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"wms": {
"zoomed_out_fill_colour": [150, 180, 200, 160],
"min_zoom_level": 6.9,
"dataset_cache_rules": dataset_cache_rules
"dataset_cache_rules": dataset_cache_rules,
"max_datasets": 24,
},
"wcs": common_wcs_limits,
}
Expand All @@ -39,6 +40,7 @@
"zoomed_out_fill_colour": [150, 180, 200, 160],
"min_zoom_level": 5.9,
"dataset_cache_rules": dataset_cache_rules,
"max_datasets": 24,
},
"wcs": common_wcs_limits,
}
Expand All @@ -48,6 +50,7 @@
"zoomed_out_fill_colour": [150, 180, 200, 160],
"min_zoom_level": 7.8,
"dataset_cache_rules": dataset_cache_rules,
"max_datasets": 24,
},
"wcs": common_wcs_limits,
}
Expand All @@ -57,6 +60,7 @@
"zoomed_out_fill_colour": [150, 180, 200, 160],
"min_zoom_level": 8.1,
"dataset_cache_rules": dataset_cache_rules,
"max_datasets": 24,
},
"wcs": common_wcs_limits,
}