Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / log.php

diff --git a/lib/log.php b/lib/log.php
index d38bb892b78a0d876e5c93a79e5b85032413b500..86d78cd2d123987cd892eb13f8590785b03fd90a 100644 (file)
--- a/lib/log.php
+++ b/lib/log.php
@@ -2,18 +2,10 @@
 
        function logStart(&$oDB, $sType = '', $sQuery = '', $aLanguageList = array())
        {
 
        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($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'];
 
                $sOutputFormat = '';
                if (isset($_GET['format'])) $sOutputFormat = $_GET['format'];
 


@@ -32,8 +24,7 @@
                                $_SERVER['QUERY_STRING'],
                                $sOutQuery,
                                $sType,
                                $_SERVER['QUERY_STRING'],
                                $sOutQuery,
                                $sType,

-                               $sUserAgent,
-                               $sOutputFormat
+                               $fStartTime

                                );
 
                if (CONST_Log_DB)
                                );
 
                if (CONST_Log_DB)


@@ -57,12 +48,14 @@
 
        function logEnd(&$oDB, $hLog, $iNumResults)
        {
 
        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)
                {
 
                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]);
                        $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)
                {
 
                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);

                }
 
        }
                }
 
        }