Changeset 7845 for trunk/src

Timestamp:

Apr 18, 2010, 11:17:31 PM (15 years ago)

Author:

rick

Message:

One level to match checking at logFile, also creation 'a+' is allowed

Location:

trunk/src

Files:

• config.php (modified) (1 diff)
• inc/LogHandler.class.php (modified) (1 diff)

trunk/src/config.php

@@ -66 +66 @@
 // Should be something like:
 // $config['kml_file']          = $config['root'] . '/kml.php?time=%TIMESTAMP%';
+
+/* Logfile stored location, should be writeable by webserver
+ */
+$config['log_file']                     =  sys_get_temp_dir() . '/NodeMap.log';
 ?>

trunk/src/inc/LogHandler.class.php

@@ -91 +91 @@
                 }
                 if ((!defined('IGNORE_LOG_LEVEL_WRITE')) && ($logno <= LOG_LEVEL_WRITE)) {
-                        $filename = 'logfile.txt';
-                        if (is_writable($filename)) {
-
-                                //Check if the file can be opened
-                                if (!$handle = fopen($filename, 'a')) {
-                                        define('IGNORE_LOG_LEVEL_WRITE', true);
-                                        trigger_log(SYSLOG_EMERG, 'Cannot open file "' . $filename . '"', __FILE__, __LINE__);
-                                        exit;
-                                }
-                                        
-                                // Write $errorString to file.
-                                if (fwrite($handle, $errorString) === FALSE) {
-                                        define('LOG_LEVEL_WRITE', LOG_LEVEL_NONE);
-                                        trigger_log(SYSLOG_EMERG, 'Cannot write to "' . $filename . '"', __FILE__, __LINE__);
-                                        exit;
-                                }
-                                        
-                                fclose($handle);
-                                        
-                        } else {
+                        global $config;
+                        $filename = $config['log_file'];
+                        //XXX: Trying to write to a file that a the file cannot be opened 
+                        //     what could possible go wrong
+                        //Check if the file can be opened
+                        if (!$handle = fopen($filename, 'a+')) {
                                 define('IGNORE_LOG_LEVEL_WRITE', true);
+                                trigger_log(SYSLOG_EMERG, 'Cannot open file "' . $filename . '"', __FILE__, __LINE__);
+                                exit;
+                        }
+                                
+                        // Write $errorString to file.
+                        if (fwrite($handle, $errorString) === FALSE) {
+                                define('LOG_LEVEL_WRITE', LOG_LEVEL_NONE);
                                 trigger_log(SYSLOG_EMERG, 'Cannot write to "' . $filename . '"', __FILE__, __LINE__);
+                                exit;
                         }
+                                
+                        fclose($handle);
                 }