Krinkle has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/348228 )
Change subject: media: Capture stderr when running 'convert --version' ...................................................................... media: Capture stderr when running 'convert --version' At Wikimedia, $wgImageMagickConvertCommand points to a shell wrapper that invokes ImageMagick convert with: firejail --profile=/etc/firejail/mediawiki-converters.profile firejail emits to stderr an information message: Reading profile /etc/firejail/mediawiki-converters.profile That ends up in HHVM stderr and is populated up to logstash as an error. MediaWiki does check imagemagick version by running `convert -version`, switch from wfShellExec() to wfShellExecWithStderr(). Bug: T158649 Change-Id: I78d1ef59533c605f59b42e10556bb595d6c2cc15 --- M includes/media/TransformationalImageHandler.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/media/TransformationalImageHandler.php b/includes/media/TransformationalImageHandler.php index 1ab0f36..2a74e0d 100644 --- a/includes/media/TransformationalImageHandler.php +++ b/includes/media/TransformationalImageHandler.php @@ -521,7 +521,7 @@ $cmd = wfEscapeShellArg( $wgImageMagickConvertCommand ) . ' -version'; wfDebug( $method . ": Running convert -version\n" ); $retval = ''; - $return = wfShellExec( $cmd, $retval ); + $return = wfShellExecWithStderr( $cmd, $retval ); $x = preg_match( '/Version: ImageMagick ([0-9]*\.[0-9]*\.[0-9]*)/', $return, $matches ); -- To view, visit https://gerrit.wikimedia.org/r/348228 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I78d1ef59533c605f59b42e10556bb595d6c2cc15 Gerrit-PatchSet: 6 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Hashar <has...@free.fr> Gerrit-Reviewer: Chad <ch...@wikimedia.org> Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org> Gerrit-Reviewer: Krinkle <krinklem...@gmail.com> Gerrit-Reviewer: Reedy <re...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits