Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/305626
Change subject: Fix bad merge in echo statusNotifications
......................................................................
Fix bad merge in echo statusNotifications
Change-Id: I47ed1e64a51394dd6191aad1198e453c0c89d7d3
---
M src/echo/statusNotifications.php
1 file changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/wmde/scripts
refs/changes/26/305626/1
diff --git a/src/echo/statusNotifications.php b/src/echo/statusNotifications.php
index 8f3e90c..1216155 100755
--- a/src/echo/statusNotifications.php
+++ b/src/echo/statusNotifications.php
@@ -45,7 +45,7 @@
$sql = "TRUNCATE TABLE $todaysTableName";
$queryResult = $pdo->query( $sql );
if( $queryResult === false ) {
- Output::timestampedMessage( "FAILED: $sql" );
+ $output->outputMessage( "FAILED: $sql" );
}
// Loop through all wiki databases
@@ -88,7 +88,7 @@
// Compare todays data with yesterdays data (if present)
$queryResult = $pdo->query( "SELECT * FROM $yesterdayTableName LIMIT 1" );
if ( $queryResult === false ) {
- Output::timestampedMessage( "FAILED: $sql" );
+ $output->outputMessage( "FAILED: $sql" );
} else if( count( $queryResult->fetchAll() ) > 0 ) {
// Work out what has changed between days
// Emulated INTERSECT: http://stackoverflow.com/a/950505/4746236
@@ -102,7 +102,7 @@
$sql = "SELECT state, COUNT(*) AS count, property FROM ( $sql ) AS a
GROUP BY state, property";
$queryResult = $pdo->query( $sql );
if ( $queryResult === false ) {
- Output::timestampedMessage( "FAILED Intersection, Skipping!!" );
+ $output->outputMessage( "FAILED Intersection, Skipping!!" );
} else {
foreach( $queryResult as $row ) {
WikimediaGraphite::sendNow(
@@ -112,14 +112,14 @@
}
}
} else {
- Output::timestampedMessage( "No data contained in yesterdays table,
Skipping!!" );
+ $output->outputMessage( "No data contained in yesterdays table,
Skipping!!" );
}
// Clear yesterdays table
$sql = "TRUNCATE TABLE $yesterdayTableName";
$queryResult = $pdo->query( $sql );
if( $queryResult === false ) {
- Output::timestampedMessage( "FAILED: $sql" );
+ $output->outputMessage( "FAILED: $sql" );
}
// Add todays data into the yesterday table
@@ -127,12 +127,12 @@
$sql .= " SELECT user_name, property FROM $todaysTableName";
$queryResult = $pdo->query( $sql );
if( $queryResult === false ) {
- Output::timestampedMessage( "FAILED: $sql" );
+ $output->outputMessage( "FAILED: $sql" );
}
// Clear todays table
$sql = "TRUNCATE TABLE $todaysTableName";
$queryResult = $pdo->query( $sql );
if( $queryResult === false ) {
- Output::timestampedMessage( "FAILED: $sql" );
+ $output->outputMessage( "FAILED: $sql" );
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/305626
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I47ed1e64a51394dd6191aad1198e453c0c89d7d3
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wmde/scripts
Gerrit-Branch: production
Gerrit-Owner: Addshore <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
