diff --git a/logging/MozLogger.php b/logging/MozLogger.php index fcc8be7..9d17e38 100644 --- a/logging/MozLogger.php +++ b/logging/MozLogger.php @@ -1,52 +1,57 @@ $type, 'Fields' => array('msg' => $message) ) ); $json = json_encode($mozlog, JSON_FORCE_OBJECT); // Write to error log error_log("$json\n", 0); // Return the $message so it can be used in exception calls return $message; } public static function merge_arrays($detailArray, $messageArray) { + $host = str_replace( + array('http:', 'https:', '/'), + '', + PhabricatorEnv::getEnvConfig('phabricator.base-uri') + ); $defaults = array( 'Timestamp' => time(), 'Type' => '', 'Logger' => 'MozPhab', - 'Hostname' => 'phabricator.services.mozilla.com', + 'Hostname' => $host, 'EnvVersion' => '1.0', 'Severity' => '3', 'Pid' => '0', 'Fields' => array( 'agent' => '', 'errno' => '0', 'method' => 'GET', 'msg' => 'Message not provided', 'path' => '', 't' => '', 'uid' => '' ) ); $merged = array_replace_recursive( $defaults, $detailArray, $messageArray ); return $merged; } }