less cache json

This commit is contained in:
2019-01-13 00:23:44 -08:00
parent 3d29d6bde4
commit dd784df708

11
pub.py
View File

@@ -29,6 +29,14 @@ TYPE_MAP = {
CSS_FILE = 'site.css' CSS_FILE = 'site.css'
BUNDLE_FILE = 'dist/bundle.js' BUNDLE_FILE = 'dist/bundle.js'
def cache_length(ext):
if ext == 'html':
return '86400'
elif ext == 'json':
return '3600'
else:
return '31536000'
def upload_file(filename, overwrite=True): def upload_file(filename, overwrite=True):
print('Uploading {} to {}/{}'.format(filename, BUCKET, filename)) print('Uploading {} to {}/{}'.format(filename, BUCKET, filename))
ext = filename.split('.')[-1] ext = filename.split('.')[-1]
@@ -44,7 +52,7 @@ def upload_file(filename, overwrite=True):
s3.upload_file(filename, BUCKET, filename, ExtraArgs={ s3.upload_file(filename, BUCKET, filename, ExtraArgs={
'ACL': 'public-read', 'ACL': 'public-read',
'ContentType': TYPE_MAP[ext], 'ContentType': TYPE_MAP[ext],
'CacheControl': 'public, max-age={}'.format('86400' if ext == 'html' else '31536000') 'CacheControl': 'public, max-age={}'.format(cache_length(ext))
}) })
print('\tDone.') print('\tDone.')
@@ -146,4 +154,3 @@ if __name__ == '__main__':
upload_root() upload_root()
if args.pub == 'img' or args.pub == 'all': if args.pub == 'img' or args.pub == 'all':
upload_images() upload_images()