X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/72032de2ca3d02a7358b5b36d9656911c62fb09f..ccaf7fa47fc7b02927ca4fe0f717e9e5b725ab9d:/lib/log.php

diff --git a/lib/log.php b/lib/log.php
index d38bb892..86d78cd2 100644
--- a/lib/log.php
+++ b/lib/log.php
@@ -2,18 +2,10 @@
 
 	function logStart(&$oDB, $sType = '', $sQuery = '', $aLanguageList = array())
 	{
-		$aStartTime = explode('.',microtime(true));
+		$fStartTime = microtime(true);
+		$aStartTime = explode('.', $fStartTime);
 		if (!isset($aStartTime[1])) $aStartTime[1] = '0';
 
-		if (isset($_GET['email']))
-				$sUserAgent = $_GET['email'];
-			elseif (isset($_SERVER['HTTP_REFERER']))
-				$sUserAgent = $_SERVER['HTTP_REFERER'];
-			elseif (isset($_SERVER['HTTP_USER_AGENT']))
-				$sUserAgent = $_SERVER['HTTP_USER_AGENT'];
-			else
-				$sUserAgent = '';
-
 		$sOutputFormat = '';
 		if (isset($_GET['format'])) $sOutputFormat = $_GET['format'];
 
@@ -32,8 +24,7 @@
 				$_SERVER['QUERY_STRING'],
 				$sOutQuery,
 				$sType,
-				$sUserAgent,
-				$sOutputFormat
+				$fStartTime
 				);
 
 		if (CONST_Log_DB)
@@ -57,12 +48,14 @@
 
 	function logEnd(&$oDB, $hLog, $iNumResults)
 	{
-		$aEndTime = explode('.',microtime(true));
-		if (!$aEndTime[1]) $aEndTime[1] = '0';
-		$sEndTime = date('Y-m-d H:i:s',$aEndTime[0]).'.'.$aEndTime[1];
+		$fEndTime = microtime(true);
 
 		if (CONST_Log_DB)
 		{
+			$aEndTime = explode('.', $fEndTime);
+			if (!$aEndTime[1]) $aEndTime[1] = '0';
+			$sEndTime = date('Y-m-d H:i:s',$aEndTime[0]).'.'.$aEndTime[1];
+
 			$sSQL = 'update new_query_log set endtime = '.getDBQuoted($sEndTime).', results = '.$iNumResults;
 			$sSQL .= ' where starttime = '.getDBQuoted($hLog[0]);
 			$sSQL .= ' and ipaddress = '.getDBQuoted($hLog[1]);
@@ -72,14 +65,10 @@
 
 		if (CONST_Log_File)
 		{
-			array_unshift($hLog, $sEndTime);
-			$hLog[] = $iNumResults;
-			$fLog = fopen(CONST_Log_File, 'a');
-			flock($fLog, LOCK_EX);
-			fputcsv($fLog, $hLog);
-			fflush($fLog);
-			flock($fLog, LOCK_UN);
-			fclose($fLog);
+			$aOutdata = sprintf("[%s] %.4f %d %s \"%s\"\n",
+			                    $hLog[0], $fEndTime-$hLog[5], $iNumResults,
+			                    $hLog[4], $hLog[2]);
+			file_put_contents(CONST_Log_File, $aOutdata, FILE_APPEND);
 		}
 
 	}