configurable file logging

Respect CONST_Log_File setting and add two new configuration
variables CONST_Log_File_SearchLog and CONST_Log_File_ReverseLog
for the log file names.

diff --git a/lib/log.php b/lib/log.php
index 8b5f00fde03086cf01872d8b52c9b78c3ea9f95f..93ad8f95f658e0b63af6b05f50322d38a8dcd6cb 100644 (file)
--- a/lib/log.php
+++ b/lib/log.php
@@ -26,10 +26,11 @@
                        $oDB->query($sSQL);
                }
 
                        $oDB->query($sSQL);
                }
 

+               if (CONST_Log_File && CONST_Log_File_ReverseLog != '') {

                 if ($sType == 'reverse')
                 {
                         $aStartTime = explode('.',$hLog[0]);
                 if ($sType == 'reverse')
                 {
                         $aStartTime = explode('.',$hLog[0]);

-                        file_put_contents('/data/mapquest/opentile_http/logs/nominatimreverse',
+                        file_put_contents(CONST_Log_File_ReverseLog,

                                 $aStartTime[0].','.$aStartTime[1].','.
                                 php_uname('n').','.
                                 '"'.addslashes(isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:'').'",'.
                                 $aStartTime[0].','.$aStartTime[1].','.
                                 php_uname('n').','.
                                 '"'.addslashes(isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:'').'",'.


@@ -41,7 +42,7 @@
                                 '"'.addslashes($_GET['format']).'"'."\n",
                         FILE_APPEND);
                 }
                                 '"'.addslashes($_GET['format']).'"'."\n",
                         FILE_APPEND);
                 }

-
+               }

 
                return $hLog;
        }
 
                return $hLog;
        }


@@ -67,8 +68,9 @@
                        $oDB->query($sSQL);
                }
 
                        $oDB->query($sSQL);
                }
 

+               if (CONST_Log_File && CONST_Log_File_SearchLog != '') {

                 $aStartTime = explode('.',$hLog[0]);
                 $aStartTime = explode('.',$hLog[0]);

-                file_put_contents('/data/mapquest/opentile_http/logs/nominatimsearch',
+                file_put_contents(CONST_Log_File_SearchLog,

                                 $aStartTime[0].','.$aStartTime[1].','.
                                 php_uname('n').','.
                                 '"'.addslashes(isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:'').'",'.
                                 $aStartTime[0].','.$aStartTime[1].','.
                                 php_uname('n').','.
                                 '"'.addslashes(isset($_SERVER['HTTP_REFERER'])?$_SERVER['HTTP_REFERER']:'').'",'.


@@ -78,5 +80,6 @@
                                 '"'.addslashes($_GET['format']).'",'.
                                 $iNumResults."\n",
                         FILE_APPEND);
                                 '"'.addslashes($_GET['format']).'",'.
                                 $iNumResults."\n",
                         FILE_APPEND);

+               }

 
        }
 
        }

diff --git a/settings/settings.php b/settings/settings.php
index 3493a34af40be61f9676d39cc58af4e97448a434..591af1c697891f37887e4f5e430bc314bcb39089 100644 (file)
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -34,3 +34,5 @@
        @define('CONST_Log_DB', true);
        @define('CONST_Log_File', false);
        @define('CONST_Log_File_Format', 'TODO'); // Currently hard coded
        @define('CONST_Log_DB', true);
        @define('CONST_Log_File', false);
        @define('CONST_Log_File_Format', 'TODO'); // Currently hard coded

+       @define('CONST_Log_File_SearchLog', '');
+       @define('CONST_Log_File_ReverseLog', '');