From 8b762bb786e4f3e8b0f982cae8627ad3ad05a821 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Thu, 30 Apr 2020 07:45:37 +0000 Subject: [PATCH 1/2] catch clamav crashes and skip to avoid upload failure --- models/site.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/models/site.rb b/models/site.rb index 81ff108c..dcdefd5e 100644 --- a/models/site.rb +++ b/models/site.rb @@ -711,7 +711,12 @@ class Site < Sequel::Model expected_outcodes: [0, 1] ) - output = line.run path: uploaded_file[:tempfile].path + begin + output = line.run path: uploaded_file[:tempfile].path + rescue Terrapin::ExitStatusError => e + puts "WARNING: CLAMAV FAILED #{username} #{uploaded_file[:tempfile].path} #{e.message}" + return true + end return true if output == '' From f225c7c336f43f2449088bac8db2c7fa83c8f114 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Thu, 30 Apr 2020 07:52:07 +0000 Subject: [PATCH 2/2] Add supporter child sites to supporter list --- app/browse.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/browse.rb b/app/browse.rb index 3a749203..54113d5b 100644 --- a/app/browse.rb +++ b/app/browse.rb @@ -62,9 +62,8 @@ def browse_sites_dataset when 'followers' ds = ds.order :follow_count.desc, :updated_at.desc when 'supporters' - ds = ds.exclude plan_type: nil - ds = ds.exclude plan_type: 'free' - ds = ds.order :views.desc, :site_updated_at.desc + ds = ds.where id: Site.supporter_ids + ds = ds.order :follow_count.desc, :views.desc, :site_updated_at.desc when 'featured' ds = ds.exclude featured_at: nil ds = ds.order :featured_at.desc