From ac2c4cb838afd1ac0176c6ed2dd9f41043603dec Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 11 Oct 2016 12:17:12 -0700
Subject: [PATCH] Call resetChildProcessServices() in ForkController

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

Change-Id: Iaf62925c0b3bf364dbaca8160f9c5bbfd97670ab
---
 includes/ForkController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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();
-- 
2.20.1