From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 26 Oct 2015 08:15:09 +0000 (-0700)
Subject: Convert getMagickVersion() to using APC
X-Git-Tag: 1.31.0-rc.0~9239^2
X-Git-Url: http://git.cyclocoop.org//%22%22._DIR_PLUGIN_FULLCALENDAR.%22prive/themes/spip/images/event_edit.png/%22?a=commitdiff_plain;h=33765cb8dd33759ca7edaffcb9e082d5e3b17043;p=lhc%2Fweb%2Fwiklou.git

Convert getMagickVersion() to using APC

Shelling out on my slow vagrant VM takes about ~3-4ms
so it's probably not worth a  fallback.

Change-Id: Ifd5758264cc15f1ae07972e839a243f5f891503e
---

diff --git a/includes/media/TransformationalImageHandler.php b/includes/media/TransformationalImageHandler.php
index 15753a96eb..35581493ee 100644
--- a/includes/media/TransformationalImageHandler.php
+++ b/includes/media/TransformationalImageHandler.php
@@ -505,30 +505,31 @@ abstract class TransformationalImageHandler extends ImageHandler {
 	 * Retrieve the version of the installed ImageMagick
 	 * You can use PHPs version_compare() to use this value
 	 * Value is cached for one hour.
-	 * @return string Representing the IM version.
+	 * @return string|bool Representing the IM version; false on error
 	 */
 	protected function getMagickVersion() {
-		global $wgMemc;
-
-		$cache = $wgMemc->get( "imagemagick-version" );
-		if ( !$cache ) {
-			global $wgImageMagickConvertCommand;
-			$cmd = wfEscapeShellArg( $wgImageMagickConvertCommand ) . ' -version';
-			wfDebug( __METHOD__ . ": Running convert -version\n" );
-			$retval = '';
-			$return = wfShellExec( $cmd, $retval );
-			$x = preg_match( '/Version: ImageMagick ([0-9]*\.[0-9]*\.[0-9]*)/', $return, $matches );
-			if ( $x != 1 ) {
-				wfDebug( __METHOD__ . ": ImageMagick version check failed\n" );
-
-				return null;
+		return ObjectCache::newAccelerator( CACHE_NONE )->getWithSetCallback(
+			"imagemagick-version",
+			3600,
+			function () {
+				global $wgImageMagickConvertCommand;
+
+				$cmd = wfEscapeShellArg( $wgImageMagickConvertCommand ) . ' -version';
+				wfDebug( __METHOD__ . ": Running convert -version\n" );
+				$retval = '';
+				$return = wfShellExec( $cmd, $retval );
+				$x = preg_match(
+					'/Version: ImageMagick ([0-9]*\.[0-9]*\.[0-9]*)/', $return, $matches
+				);
+				if ( $x != 1 ) {
+					wfDebug( __METHOD__ . ": ImageMagick version check failed\n" );
+
+					return false;
+				}
+
+				return $matches[1];
 			}
-			$wgMemc->set( "imagemagick-version", $matches[1], 3600 );
-
-			return $matches[1];
-		}
-
-		return $cache;
+		);
 	}
 
 	/**