Hashar has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/350203 )
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
(cherry picked from commit c5d736bcad9af765e51e1bd44746e9483d4dbd75)
---
M includes/media/TransformationalImageHandler.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Hashar: Verified; Looks good to me, approved
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/350203
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I78d1ef59533c605f59b42e10556bb595d6c2cc15
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.29.0-wmf.20
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
