jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/379604 )
Change subject: Don't delete stuff from the pagetriage_log unless it's a year
old
......................................................................
Don't delete stuff from the pagetriage_log unless it's a year old
Bug: T168335
Change-Id: Id589a6f50d5171af8d2360d9d54f3f85d15cd79d
---
M cron/updatePageTriageQueue.php
M includes/PageTriage.php
2 files changed, 11 insertions(+), 13 deletions(-)
Approvals:
jenkins-bot: Verified
MusikAnimal: Looks good to me, approved
diff --git a/cron/updatePageTriageQueue.php b/cron/updatePageTriageQueue.php
index 3134ba2..7655087 100644
--- a/cron/updatePageTriageQueue.php
+++ b/cron/updatePageTriageQueue.php
@@ -99,12 +99,6 @@
__METHOD__,
[]
);
- $this->dbw->delete(
- 'pagetriage_log',
- [ 'ptrl_page_id' => $pageId ],
- __METHOD__,
- []
- );
$articleMetadata = new ArticleMetadata( $pageId
);
$articleMetadata->deleteMetadata();
@@ -115,6 +109,16 @@
wfWaitForSlaves();
}
+ // Also clean-up old logging data while we're at it.
+ $yearago = wfTimestamp( TS_UNIX ) - 365 * 60 * 60 * 24;
+ $yearago = $this->dbr->addQuotes( $this->dbr->timestamp(
$yearago ) );
+ $this->dbw->delete(
+ 'pagetriage_log',
+ [ 'ptrl_timestamp < ' . $yearago ],
+ __METHOD__,
+ []
+ );
+
$this->output( "Completed \n" );
}
}
diff --git a/includes/PageTriage.php b/includes/PageTriage.php
index e22bc79..1bb43ba 100644
--- a/includes/PageTriage.php
+++ b/includes/PageTriage.php
@@ -224,7 +224,7 @@
}
/**
- * Delete the page from page triage queue and log
+ * Delete the page from page triage queue
*/
public function deleteFromPageTriage() {
$dbw = wfGetDB( DB_MASTER );
@@ -236,12 +236,6 @@
$dbw->delete(
'pagetriage_page',
[ 'ptrp_page_id' => $this->mPageId ],
- __METHOD__,
- []
- );
- $dbw->delete(
- 'pagetriage_log',
- [ 'ptrl_page_id' => $this->mPageId ],
__METHOD__,
[]
);
--
To view, visit https://gerrit.wikimedia.org/r/379604
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id589a6f50d5171af8d2360d9d54f3f85d15cd79d
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/PageTriage
Gerrit-Branch: master
Gerrit-Owner: Kaldari <[email protected]>
Gerrit-Reviewer: Kaldari <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: MusikAnimal <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
