Merge "Remove unused ApiStashEdit variable"

[lhc/web/wiklou.git] / includes / api / ApiStashEdit.php

diff --git a/includes/api/ApiStashEdit.php b/includes/api/ApiStashEdit.php
index 6ca9c7c..8822750 100644 (file)
--- a/includes/api/ApiStashEdit.php
+++ b/includes/api/ApiStashEdit.php
@@ -250,6 +250,7 @@ class ApiStashEdit extends ApiBase {
        public static function checkCache( Title $title, Content $content, User $user ) {
                $cache = ObjectCache::getLocalClusterInstance();
                $logger = LoggerFactory::getInstance( 'StashEdit' );
+               $stats = RequestContext::getMain()->getStats();
 
                $key = self::getStashKey( $title, $content, $user );
                $editInfo = $cache->get( $key );
@@ -265,19 +266,20 @@ class ApiStashEdit extends ApiBase {
                                $editInfo = $cache->get( $key );
                                $dbw->unlock( $key, __METHOD__ );
                        }
-                       $sec = microtime( true ) - $start;
-                       if ( $sec > .01 ) {
-                               $logger->warning( "Waited $sec seconds on '$key'." );
-                       }
+
+                       $timeMs = 1000 * max( 0, microtime( true ) - $start );
+                       $stats->timing( 'editstash.lock-wait-time', $timeMs );
                }
 
                if ( !is_object( $editInfo ) || !$editInfo->output ) {
+                       $stats->increment( 'editstash.cache-misses' );
                        $logger->debug( "No cache value for key '$key'." );
                        return false;
                }
 
                $time = wfTimestamp( TS_UNIX, $editInfo->output->getTimestamp() );
                if ( ( time() - $time ) <= 3 ) {
+                       $stats->increment( 'editstash.cache-hits' );
                        $logger->debug( "Timestamp-based cache hit for key '$key'." );
                        return $editInfo; // assume nothing changed
                }
@@ -306,6 +308,7 @@ class ApiStashEdit extends ApiBase {
                        }
 
                        if ( $changed || $res->numRows() != $templateUses ) {
+                               $stats->increment( 'editstash.cache-misses' );
                                $logger->info( "Stale cache for key '$key'; template changed." );
                                return false;
                        }
@@ -329,11 +332,13 @@ class ApiStashEdit extends ApiBase {
                        }
 
                        if ( $changed || $res->numRows() != count( $files ) ) {
+                               $stats->increment( 'editstash.cache-misses' );
                                $logger->info( "Stale cache for key '$key'; file changed." );
                                return false;
                        }
                }
 
+               $stats->increment( 'editstash.cache-hits' );
                $logger->debug( "Cache hit for key '$key'." );
 
                return $editInfo;