Merge "Update ApiAction logging channel values"

diff --combined includes/api/ApiMain.php
index c7c48b3,e9d6316..6112cac
--- 1/includes/api/ApiMain.php
--- 2/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@@ -919,7 -919,7 +919,7 @@@ class ApiMain extends ApiBase 
                if ( $this->getConfig()->get( 'ShowHostnames' ) ) {
                        $servedby = $this->getParameter( 'servedby' );
                        if ( $servedby ) {
 -                              $result->addValue( null, 'servedby', wfHostName() );
 +                              $result->addValue( null, 'servedby', wfHostname() );
                        }
                }
  
@@@ -1341,19 -1341,19 +1341,19 @@@
        protected function logRequest( $time ) {
                $request = $this->getRequest();
                $logCtx = [
-                       'dt' => date( 'c' ),
-                       'client_ip' => $request->getIP(),
-                       'user_agent' => $this->getUserAgent(),
+                       'ts' => time(),
+                       'ip' => $request->getIP(),
+                       'userAgent' => $this->getUserAgent(),
                        'wiki' => wfWikiID(),
-                       'time_backend_ms' => round( $time * 1000 ),
+                       'timeSpentBackend' => round( $time * 1000 ),
                        'params' => [],
                ];
  
                // Construct space separated message for 'api' log channel
                $msg = "API {$request->getMethod()} " .
                        wfUrlencode( str_replace( ' ', '_', $this->getUser()->getName() ) ) .
-                       " {$logCtx['client_ip']} " .
-                       "T={$logCtx['time_backend_ms']}ms";
+                       " {$logCtx['ip']} " .
+                       "T={$logCtx['timeSpentBackend']}ms";
  
                foreach ( $this->getParamsUsed() as $name ) {
                        $value = $request->getVal( $name );