Merge remote-tracking branch 'upstream/master' into cmake-port

[nominatim.git] / lib / log.php

diff --git a/lib/log.php b/lib/log.php
index 80e2ac54db8490284d0d4400bed9332c5ac3c5cc..de19167bbb864294e07d8c0418ab51abe9fd7bf3 100644 (file)
--- a/lib/log.php
+++ b/lib/log.php
@@ -2,7 +2,8 @@
 
        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';
 
                $sOutputFormat = '';
                if (!isset($aStartTime[1])) $aStartTime[1] = '0';
 
                $sOutputFormat = '';


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

-                               $sOutputFormat
+                               $fStartTime

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


@@ -47,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]);


@@ -62,13 +65,10 @@
 
                if (CONST_Log_File)
                {
 
                if (CONST_Log_File)
                {

-                       $aOutdata = array($hLog[0], $sEndTime, $iNumResults, $hLog[4], $hLog[2]);
-                       $fLog = fopen(CONST_Log_File, 'a');
-                       flock($fLog, LOCK_EX);
-                       fputcsv($fLog, $aOutdata);
-                       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 | LOCK_EX);

                }
 
        }
                }
 
        }