Legoktm has submitted this change and it was merged.
Change subject: Fixed DB handling in wfWhosOnline_update_data
......................................................................
Fixed DB handling in wfWhosOnline_update_data
Change-Id: Ib46a80cf9e39bb6019319ae9b6eab46e49abe7b8
---
M WhosOnline.php
1 file changed, 13 insertions(+), 12 deletions(-)
Approvals:
Chad: Looks good to me, but someone else must approve
Legoktm: Verified; Looks good to me, approved
diff --git a/WhosOnline.php b/WhosOnline.php
index b5f00d0..02ae6db 100644
--- a/WhosOnline.php
+++ b/WhosOnline.php
@@ -40,30 +40,31 @@
$wgSpecialPages['WhosOnline'] = 'SpecialWhosOnline';
$wgHooks['BeforePageDisplay'][] = 'wfWhosOnline_update_data';
+
// update online data
function wfWhosOnline_update_data() {
- global $wgUser, $wgDBname;
-
- wfProfileIn( __METHOD__ );
+ global $wgUser;
// write to DB (use master)
- $db = wfGetDB( DB_MASTER );
- $db->selectDB( $wgDBname );
-
+ $dbw = wfGetDB( DB_MASTER );
$now = gmdate( 'YmdHis', time() );
// row to insert to table
$row = array(
- 'userid' => $wgUser->getID(),
+ 'userid' => $wgUser->getId(),
'username' => $wgUser->getName(),
'timestamp' => $now
);
- $ignore = $db->ignoreErrors( true );
- $db->insert( 'online', $row, __METHOD__, 'DELAYED' );
- $db->ignoreErrors( $ignore );
-
- wfProfileOut( __METHOD__ );
+ $method = __METHOD__;
+ $dbw->onTransactionIdle( function() use ( $dbw, $method, $row ) {
+ $dbw->upsert( 'online',
+ $row,
+ array( array( 'userid', 'username' ) ),
+ array( 'timestamp' => $row['timestamp'] ),
+ $method
+ );
+ } );
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/195087
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib46a80cf9e39bb6019319ae9b6eab46e49abe7b8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WhosOnline
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
