wikimedia/mediawiki-extensions-Scribunto
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Scribunto synced 2024-11-24 16:25:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Use PSR-3 logging instead of wfDebug()"

Browse source
This commit is contained in:
jenkins-bot 2018-02-11 14:54:14 +00:00 committed by Gerrit Code Review
parent 8d844ef647 d8687a5c82
commit 2b0314e4ab
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
engines/LuaStandalone/LuaStandaloneEngine.php
View file

@ -1,5 +1,9 @@
<?php
use MediaWiki\Logger\LoggerFactory;
use Psr\Log\LoggerInterface;
use Psr\Log\NullLogger;
// @codingStandardsIgnoreLine Squiz.Classes.ValidClassName.NotCamelCaps
class Scribunto_LuaStandaloneEngine extends Scribunto_LuaEngine {
protected static $clockTick;
@ -89,7 +93,9 @@ class Scribunto_LuaStandaloneEngine extends Scribunto_LuaEngine {
* @return Scribunto_LuaStandaloneInterpreter
*/
function newInterpreter() {
return new Scribunto_LuaStandaloneInterpreter( $this, $this->options );
return new Scribunto_LuaStandaloneInterpreter( $this, $this->options + [
'logger' => LoggerFactory::getInstance( 'Scribunto' )
] );
}
public function getSoftwareInfo( array &$software ) {
@ -143,6 +149,11 @@ class Scribunto_LuaStandaloneInterpreter extends Scribunto_LuaInterpreter {
*/
public $id;
/**
* @var LoggerInterface
*/
protected $logger;
/**
* @param Scribunto_LuaStandaloneEngine $engine
* @param array $options
@ -192,6 +203,9 @@ class Scribunto_LuaStandaloneInterpreter extends Scribunto_LuaInterpreter {
$this->engine = $engine;
$this->enableDebug = !empty( $options['debug'] );
$this->logger = isset( $options['logger'] )
? $options['logger']
: new NullLogger();
$pipes = null;
$cmd = wfEscapeShellArg(
@ -222,7 +236,7 @@ class Scribunto_LuaStandaloneInterpreter extends Scribunto_LuaInterpreter {
$cmd = '"' . $cmd . '"';
}
wfDebug( __METHOD__.": creating interpreter: $cmd\n" );
$this->logger->debug( __METHOD__.": creating interpreter: $cmd\n" );
// Check whether proc_open is available before trying to call it (e.g.
// PHP's disable_functions may have removed it)
@ -292,7 +306,7 @@ class Scribunto_LuaStandaloneInterpreter extends Scribunto_LuaInterpreter {
public function terminate() {
if ( $this->proc ) {
wfDebug( __METHOD__.": terminating\n" );
$this->logger->debug( __METHOD__.": terminating\n" );
proc_terminate( $this->proc );
proc_close( $this->proc );
$this->proc = false;
@ -479,7 +493,7 @@ class Scribunto_LuaStandaloneInterpreter extends Scribunto_LuaInterpreter {
$this->handleError( $msgFromLua );
return; // not reached
default:
wfDebug( __METHOD__ .": invalid response op \"{$msgFromLua['op']}\"\n" );
$this->logger->error( __METHOD__ .": invalid response op \"{$msgFromLua['op']}\"\n" );
throw $this->engine->newException( 'scribunto-luastandalone-decode-error' );
}
}
@ -628,7 +642,7 @@ class Scribunto_LuaStandaloneInterpreter extends Scribunto_LuaInterpreter {
*/
protected function checkValid() {
if ( !$this->proc ) {
wfDebug( __METHOD__ . ": process already terminated\n" );
$this->logger->error( __METHOD__ . ": process already terminated\n" );
if ( $this->exitError ) {
throw $this->exitError;
} else {
@ -683,7 +697,7 @@ class Scribunto_LuaStandaloneInterpreter extends Scribunto_LuaInterpreter {
protected function debug( $msg ) {
if ( $this->enableDebug ) {
wfDebug( "Lua: $msg\n" );
$this->logger->debug( "Lua: $msg\n" );
}
}
}