API: Return HTTP 503 status code on maxlag error, like index.php does

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 58bd9f2..5ef87d1 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -225,6 +225,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 18785) Add siprop=languages to meta=siteinfo
 * (bug 14200) Added user and excludeuser parameters to list=watchlist and
   list=recentchanges
+* Return HTTP 503 status code on maxlag error, like index.php does
 
 === Languages updated in 1.16 ===
 

diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 218f4d2..f39a2fc 100644 (file)
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -378,11 +378,10 @@ class ApiMain extends ApiBase {
                        if ( $lag > $maxLag ) {
                                header( 'Retry-After: ' . max( intval( $maxLag ), 5 ) );
                                header( 'X-Database-Lag: ' . intval( $lag ) );
-                               // XXX: should we return a 503 HTTP error code like wfMaxlagError() does?
                                if( $wgShowHostnames ) {
-                                       $this->dieUsage( "Waiting for $host: $lag seconds lagged", 'maxlag' );
+                                       $this->dieUsage( "Waiting for $host: $lag seconds lagged", 'maxlag', 503 );
                                } else {
-                                       $this->dieUsage( "Waiting for a database server: $lag seconds lagged", 'maxlag' );
+                                       $this->dieUsage( "Waiting for a database server: $lag seconds lagged", 'maxlag', 503 );
                                }
                                return;
                        }