From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 18 Oct 2013 20:58:13 +0000 (-0700)
Subject: Fixed a bunch of annoying deprecation notices
X-Git-Tag: 1.31.0-rc.0~18470
X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=commitdiff_plain;h=dbbc247d9a65a6487cfe80f3cfdb94ac99c15d2c;p=lhc%2Fweb%2Fwiklou.git

Fixed a bunch of annoying deprecation notices

Change-Id: Ic2eb0ea94d8e27574f7dc76f1b448ccd6c01bb98
---

diff --git a/includes/job/JobQueueFederated.php b/includes/job/JobQueueFederated.php
index ce2f3c71b7..fb2ef0dc25 100644
--- a/includes/job/JobQueueFederated.php
+++ b/includes/job/JobQueueFederated.php
@@ -140,7 +140,7 @@ class JobQueueFederated extends JobQueue {
 					return false;
 				}
 			} catch ( JobQueueError $e ) {
-				wfDebugLog( 'exception', $e->getLogMessage() );
+				MWExceptionHandler::logException( $e );
 			}
 		}
 
@@ -182,7 +182,7 @@ class JobQueueFederated extends JobQueue {
 			try {
 				$count += $queue->$method();
 			} catch ( JobQueueError $e ) {
-				wfDebugLog( 'exception', $e->getLogMessage() );
+				MWExceptionHandler::logException( $e );
 			}
 		}
 
@@ -242,7 +242,7 @@ class JobQueueFederated extends JobQueue {
 				$ok = $queue->doBatchPush( $jobBatch, $flags | self::QOS_ATOMIC );
 			} catch ( JobQueueError $e ) {
 				$ok = false;
-				wfDebugLog( 'exception', $e->getLogMessage() );
+				MWExceptionHandler::logException( $e );
 			}
 			if ( $ok ) {
 				$key = $this->getCacheKey( 'empty' );
@@ -264,7 +264,7 @@ class JobQueueFederated extends JobQueue {
 				$ok = $queue->doBatchPush( $jobBatch, $flags | self::QOS_ATOMIC );
 			} catch ( JobQueueError $e ) {
 				$ok = false;
-				wfDebugLog( 'exception', $e->getLogMessage() );
+				MWExceptionHandler::logException( $e );
 			}
 			if ( $ok ) {
 				$key = $this->getCacheKey( 'empty' );
@@ -301,7 +301,7 @@ class JobQueueFederated extends JobQueue {
 				$job = $queue->pop();
 			} catch ( JobQueueError $e ) {
 				$job = false;
-				wfDebugLog( 'exception', $e->getLogMessage() );
+				MWExceptionHandler::logException( $e );
 			}
 			if ( $job ) {
 				$job->metadata['QueuePartition'] = $partition;
@@ -353,7 +353,7 @@ class JobQueueFederated extends JobQueue {
 			try {
 				$queue->doDelete();
 			} catch ( JobQueueError $e ) {
-				wfDebugLog( 'exception', $e->getLogMessage() );
+				MWExceptionHandler::logException( $e );
 			}
 		}
 	}
@@ -363,7 +363,7 @@ class JobQueueFederated extends JobQueue {
 			try {
 				$queue->waitForBackups();
 			} catch ( JobQueueError $e ) {
-				wfDebugLog( 'exception', $e->getLogMessage() );
+				MWExceptionHandler::logException( $e );
 			}
 		}
 	}
@@ -426,7 +426,7 @@ class JobQueueFederated extends JobQueue {
 					return null; // not supported on all partitions; bail
 				}
 			} catch ( JobQueueError $e ) {
-				wfDebugLog( 'exception', $e->getLogMessage() );
+				MWExceptionHandler::logException( $e );
 			}
 		}
 		return array_values( array_unique( $result ) );
@@ -445,7 +445,7 @@ class JobQueueFederated extends JobQueue {
 					return null; // not supported on all partitions; bail
 				}
 			} catch ( JobQueueError $e ) {
-				wfDebugLog( 'exception', $e->getLogMessage() );
+				MWExceptionHandler::logException( $e );
 			}
 		}
 		return $result;