Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
matrix-media-repo
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
matrix-media-repo
Commits
15fb72d2
Commit
15fb72d2
authored
1 year ago
by
Travis Ralston
Browse files
Options
Downloads
Patches
Plain Diff
Implement URL preview purge
parent
26d57ac6
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
database/table_url_previews.go
+12
-2
12 additions, 2 deletions
database/table_url_previews.go
tasks/task_runner/purge_previews.go
+20
-1
20 additions, 1 deletion
tasks/task_runner/purge_previews.go
with
32 additions
and
3 deletions
database/table_url_previews.go
+
12
−
2
View file @
15fb72d2
...
@@ -27,10 +27,12 @@ type DbUrlPreview struct {
...
@@ -27,10 +27,12 @@ type DbUrlPreview struct {
const
selectUrlPreview
=
"SELECT url, error_code, bucket_ts, site_url, site_name, resource_type, description, title, image_mxc, image_type, image_size, image_width, image_height, language_header FROM url_previews WHERE url = $1 AND bucket_ts = $2 AND language_header = $3;"
const
selectUrlPreview
=
"SELECT url, error_code, bucket_ts, site_url, site_name, resource_type, description, title, image_mxc, image_type, image_size, image_width, image_height, language_header FROM url_previews WHERE url = $1 AND bucket_ts = $2 AND language_header = $3;"
const
insertUrlPreview
=
"INSERT INTO url_previews (url, error_code, bucket_ts, site_url, site_name, resource_type, description, title, image_mxc, image_type, image_size, image_width, image_height, language_header) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14);"
const
insertUrlPreview
=
"INSERT INTO url_previews (url, error_code, bucket_ts, site_url, site_name, resource_type, description, title, image_mxc, image_type, image_size, image_width, image_height, language_header) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14);"
const
deleteOldUrlPreviews
=
"DELETE FROM url_previews WHERE bucket_ts <= $1;"
type
urlPreviewsTableStatements
struct
{
type
urlPreviewsTableStatements
struct
{
selectUrlPreview
*
sql
.
Stmt
selectUrlPreview
*
sql
.
Stmt
insertUrlPreview
*
sql
.
Stmt
insertUrlPreview
*
sql
.
Stmt
deleteOldUrlPreviews
*
sql
.
Stmt
}
}
type
urlPreviewsTableWithContext
struct
{
type
urlPreviewsTableWithContext
struct
{
...
@@ -48,6 +50,9 @@ func prepareUrlPreviewsTables(db *sql.DB) (*urlPreviewsTableStatements, error) {
...
@@ -48,6 +50,9 @@ func prepareUrlPreviewsTables(db *sql.DB) (*urlPreviewsTableStatements, error) {
if
stmts
.
insertUrlPreview
,
err
=
db
.
Prepare
(
insertUrlPreview
);
err
!=
nil
{
if
stmts
.
insertUrlPreview
,
err
=
db
.
Prepare
(
insertUrlPreview
);
err
!=
nil
{
return
nil
,
errors
.
New
(
"error preparing insertUrlPreview: "
+
err
.
Error
())
return
nil
,
errors
.
New
(
"error preparing insertUrlPreview: "
+
err
.
Error
())
}
}
if
stmts
.
deleteOldUrlPreviews
,
err
=
db
.
Prepare
(
deleteOldUrlPreviews
);
err
!=
nil
{
return
nil
,
errors
.
New
(
"error preparing deleteOldUrlPreviews: "
+
err
.
Error
())
}
return
stmts
,
nil
return
stmts
,
nil
}
}
...
@@ -82,3 +87,8 @@ func (s *urlPreviewsTableWithContext) InsertError(url string, errorCode string)
...
@@ -82,3 +87,8 @@ func (s *urlPreviewsTableWithContext) InsertError(url string, errorCode string)
// remainder of fields don't matter
// remainder of fields don't matter
})
})
}
}
func
(
s
*
urlPreviewsTableWithContext
)
DeleteOlderThan
(
ts
int64
)
error
{
_
,
err
:=
s
.
statements
.
deleteOldUrlPreviews
.
ExecContext
(
s
.
ctx
,
ts
)
return
err
}
This diff is collapsed.
Click to expand it.
tasks/task_runner/purge_previews.go
+
20
−
1
View file @
15fb72d2
package
task_runner
package
task_runner
import
"github.com/turt2live/matrix-media-repo/common/rcontext"
import
(
"github.com/getsentry/sentry-go"
"github.com/turt2live/matrix-media-repo/common/config"
"github.com/turt2live/matrix-media-repo/common/rcontext"
"github.com/turt2live/matrix-media-repo/database"
"github.com/turt2live/matrix-media-repo/util"
)
func
PurgePreviews
(
ctx
rcontext
.
RequestContext
)
{
func
PurgePreviews
(
ctx
rcontext
.
RequestContext
)
{
// dev note: don't use ctx for config lookup to avoid misreading it
if
config
.
Get
()
.
UrlPreviews
.
ExpireDays
<=
0
{
return
}
beforeTs
:=
util
.
NowMillis
()
-
int64
(
config
.
Get
()
.
UrlPreviews
.
ExpireDays
*
24
*
60
*
60
*
1000
)
db
:=
database
.
GetInstance
()
.
UrlPreviews
.
Prepare
(
ctx
)
// TODO: Fix https://github.com/turt2live/matrix-media-repo/issues/424 ("can't clean up preview media")
if
err
:=
db
.
DeleteOlderThan
(
beforeTs
);
err
!=
nil
{
ctx
.
Log
.
Error
(
"Error deleting previews: "
,
err
)
sentry
.
CaptureException
(
err
)
}
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment