From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 11 Oct 2016 19:17:12 +0000 (-0700)
Subject: Call resetChildProcessServices() in ForkController
X-Git-Tag: 1.31.0-rc.0~5144^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/Foo_bar?a=commitdiff_plain;h=ac2c4cb838afd1ac0176c6ed2dd9f41043603dec;p=lhc%2Fweb%2Fwiklou.git

Call resetChildProcessServices() in ForkController

Use this instead of bogus destroyInstance() call to LBFactory.

Change-Id: Iaf62925c0b3bf364dbaca8160f9c5bbfd97670ab
---

diff --git a/includes/ForkController.php b/includes/ForkController.php
index da4cd17dd7..2dde17be08 100644
--- a/includes/ForkController.php
+++ b/includes/ForkController.php
@@ -19,6 +19,7 @@
  *
  * @file
  */
+use MediaWiki\MediaWikiServices;
 
 /**
  * Class for managing forking command line scripts.
@@ -150,7 +151,7 @@ class ForkController {
 	protected function prepareEnvironment() {
 		global $wgMemc;
 		// Don't share DB, storage, or memcached connections
-		wfGetLBFactory()->destroy();
+		MediaWikiServices::resetChildProcessServices();
 		FileBackendGroup::destroySingleton();
 		LockManagerGroup::destroySingletons();
 		JobQueueGroup::destroySingletons();