From 222b01f5169f1c7e69762e0e8904c24f78f71882 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Wed, 28 Jul 2010 11:52:48 +0200
Subject: update to MediaWiki 1.16.0

---
 maintenance/gearman/gearman.inc       | 2 +-
 maintenance/gearman/gearmanWorker.php | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'maintenance/gearman')

diff --git a/maintenance/gearman/gearman.inc b/maintenance/gearman/gearman.inc
index a2a4018a..514b9bac 100644
--- a/maintenance/gearman/gearman.inc
+++ b/maintenance/gearman/gearman.inc
@@ -12,7 +12,7 @@ class MWGearmanJob extends Net_Gearman_Job_Common {
 		socket_close( $this->conn );
 
 		# Close some more sockets
-		wfGetLBFactory()->shutdown();
+		LBFactory::destroyInstance();
 		global $wgMemc;
 		$wgMemc->disconnect_all();
 
diff --git a/maintenance/gearman/gearmanWorker.php b/maintenance/gearman/gearmanWorker.php
index 0b26ff9f..d6f3949f 100644
--- a/maintenance/gearman/gearmanWorker.php
+++ b/maintenance/gearman/gearmanWorker.php
@@ -4,6 +4,8 @@ $optionsWithArgs = array( 'fake-job', 'procs' );
 require( dirname(__FILE__).'/../commandLine.inc' );
 require( dirname(__FILE__).'/gearman.inc' );
 
+ini_set('memory_limit', '150M' );
+
 if ( isset( $options['procs'] ) ) {
 	$procs = $options['procs'];
 	if ( $procs < 1 || $procs > 1000 ) {
-- 
cgit v1.2.2