mirror_maker/synapse-s3-storage-provider
1
0
Fork 1
mirror of https://github.com/matrix-org/synapse-s3-storage-provider.git synced 2024-10-23 07:29:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #47 from matrix-org/erikj/fallback_to_created_ts

Browse source 
Fix upload script to handle media that has never been accessed
This commit is contained in:
Erik Johnston 2020-10-28 10:02:05 +00:00 committed by GitHub
commit d58c93d7ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/s3_media_upload
View file

@ -63,7 +63,7 @@ def run_update_db(postgres_conn, sqlite_conn, before_date):
SELECT '', media_id, media_id SELECT '', media_id, media_id
FROM local_media_repository FROM local_media_repository
WHERE WHERE
last_access_ts < %s COALESCE(last_access_ts, created_ts) < %s
AND url_cache IS NULL AND url_cache IS NULL
""" """
@ -71,7 +71,7 @@ def run_update_db(postgres_conn, sqlite_conn, before_date):
SELECT media_origin, media_id, filesystem_id SELECT media_origin, media_id, filesystem_id
FROM remote_media_cache FROM remote_media_cache
WHERE WHERE
last_access_ts < %s COALESCE(last_access_ts, created_ts) < %s
""" """
last_access_ts = int(before_date.timestamp() * 1000) last_access_ts = int(before_date.timestamp() * 1000)