coren has submitted this change and it was merged.

Change subject: Change test for log_type to a list
......................................................................


Change test for log_type to a list

So that changes or new extensions are handled correctly.

Change-Id: Ife76854334d0b0e89bc1d0c9a6319e035303f96d
---
M maintain-replicas/maintain-replicas.pl
1 file changed, 14 insertions(+), 3 deletions(-)

Approvals:
  Jcrespo: Looks good to me, but someone else must approve
  coren: Verified; Looks good to me, approved



diff --git a/maintain-replicas/maintain-replicas.pl 
b/maintain-replicas/maintain-replicas.pl
index 87890cd..72eabf3 100755
--- a/maintain-replicas/maintain-replicas.pl
+++ b/maintain-replicas/maintain-replicas.pl
@@ -88,6 +88,16 @@
     'wbc_entity_usage', 'wbs_propertypairs',
 );
 
+my @logging_whitelist = (
+    'gblrights', 'globalauth', 'close', 'lock', 'gblblock', 'managetags', 
'gather', 'campus',
+    'institution', 'instructor', 'online', 'merge', 'massmessage', 'course', 
'stable', 'import',
+    'abusefilter', 'student', 'eparticle', 'rights', 'pagetriage-deletion', 
'protect',
+    'pagetriage-curation', 'thanks', 'renameuser', 'review', 'block', 
'upload', 'move',
+    'delete', 'patrol', 'newusers'
+);
+
+my $safelog = "log_type IN ('" . join("', '", @logging_whitelist) . "')";
+
 my %customviews = (
 
     'abuse_filter' => {
@@ -206,7 +216,8 @@
                     if(log_deleted,null,log_params) as log_params, log_deleted,
                     if(log_deleted&4,null,log_user_text) as log_user_text,
                     if(log_deleted&1,null,log_page) as log_page',
-        'where' => 'log_type<>\'suppress\'' },
+        'where' => $safelog },
+
 
     'logging_logindex' => {
         'source' => 'logging',
@@ -215,7 +226,7 @@
                     if(log_deleted&2,null,log_comment) as log_comment,
                     if(log_deleted,null,log_params) as log_params, log_deleted,
                     if(log_deleted&4,null,log_user_text) as log_user_text, 
log_page',
-        'where' => '(log_deleted&1)=0 and log_type<>\'suppress\'' },
+        'where' => "(log_deleted&1)=0 and $safelog" },
 
     'logging_userindex' => {
         'source' => 'logging',
@@ -225,7 +236,7 @@
                     if(log_deleted&2,null,log_comment) as log_comment,
                     if(log_deleted,null,log_params) as log_params, log_deleted,
                     log_user_text as log_user_text, 
if(log_deleted&1,null,log_page) as log_page',
-        'where' => '(log_deleted&4)=0 and log_type<>\'suppress\'' },
+        'where' => "(log_deleted&4)=0 and $safelog" },
 
     'mark_as_helpful' => {
         'source' => 'mark_as_helpful',

-- 
To view, visit https://gerrit.wikimedia.org/r/230645
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ife76854334d0b0e89bc1d0c9a6319e035303f96d
Gerrit-PatchSet: 2
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: coren <[email protected]>
Gerrit-Reviewer: Jcrespo <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: coren <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to