Merge "Add CollationFa"

[lhc/web/wiklou.git] / includes / ForkController.php

diff --git a/includes/ForkController.php b/includes/ForkController.php
index 4a021ee..2dde17b 100644 (file)
--- a/includes/ForkController.php
+++ b/includes/ForkController.php
@@ -19,6 +19,7 @@
  *
  * @file
  */
+use MediaWiki\MediaWikiServices;
 
 /**
  * Class for managing forking command line scripts.
@@ -30,11 +31,11 @@
  * @ingroup Maintenance
  */
 class ForkController {
-       protected $children = array(), $childNumber = 0;
+       protected $children = [], $childNumber = 0;
        protected $termReceived = false;
        protected $flags = 0, $procsToStart = 0;
 
-       protected static $restartableSignals = array(
+       protected static $restartableSignals = [
                SIGFPE,
                SIGILL,
                SIGSEGV,
@@ -44,7 +45,7 @@ class ForkController {
                SIGPIPE,
                SIGXCPU,
                SIGXFSZ,
-       );
+       ];
 
        /**
         * Pass this flag to __construct() to cause the class to automatically restart
@@ -73,7 +74,7 @@ class ForkController {
         */
        public function start() {
                // Trap SIGTERM
-               pcntl_signal( SIGTERM, array( $this, 'handleTermSignal' ), false );
+               pcntl_signal( SIGTERM, [ $this, 'handleTermSignal' ], false );
 
                do {
                        // Start child processes
@@ -150,7 +151,7 @@ class ForkController {
        protected function prepareEnvironment() {
                global $wgMemc;
                // Don't share DB, storage, or memcached connections
-               wfGetLBFactory()->destroyInstance();
+               MediaWikiServices::resetChildProcessServices();
                FileBackendGroup::destroySingleton();
                LockManagerGroup::destroySingletons();
                JobQueueGroup::destroySingletons();