Changeset 44 for trunk/lib/App.inc.php

Timestamp:

Dec 19, 2005 7:10:45 AM (18 years ago)

Author:

scdev

Message:

${1}

File:

• trunk/lib/App.inc.php (modified) (4 diffs)

trunk/lib/App.inc.php

@@ -367 +367 @@
 
         // Save message in session under unique key to avoid duplicate messages.
-        $_SESSION[$this->app]['messages'][md5($type . $message . $file . $line)] = array(
+        $msg_id = md5($type . $message . $file . $line);
+        $_SESSION[$this->app]['messages'][$msg_id] = array(
             'type'    => $type,
             'message' => $message,
             'file'    => $file,
-            'line'    => $line
+            'line'    => $line,
+            'count'   => (isset($_SESSION[$this->app]['messages'][$msg_id]['count']) ? (1 + $_SESSION[$this->app]['messages'][$msg_id]['count']) : 1)
         );
 
@@ -425 +427 @@
 
     /**
-     * Logs a message to a user defined log file. Additional actions to take for
-     * different types of message types can be specified (ERROR, NOTICE, etc).
+     * Logs messages to defined channels: file, email, sms, and screen. Repeated messages are
+     * not repeated but printed once with count.
      *
      * @access public
-     *
      * @param string $message   The text description of the message.
      * @param int    $priority  The type of message priority (in descending order):
@@ -445 +446 @@
     function logMsg($message, $priority=LOG_INFO, $file=null, $line=null)
     {
+        static $previous_events = array();
+
         if (!isset($this) || !is_a($this, 'App')) {
             $this =& App::getInstance();
@@ -466 +469 @@
         setlocale(LC_TIME, 'C');
 
+        // Strip HTML tags except any with more than 7 characters because that's probably not a HTML tag, e.g. <email@address.com>.
+        preg_match_all('/(<[^>\s]{7,})[^>]*>/', $message, $strip_tags_allow);
+        $message = strip_tags(preg_replace('/\s+/', ' ', $message), (!empty($strip_tags_allow[1]) ? join('> ', $strip_tags_allow[1]) . '>' : null));
+
+        // Store this event under a unique key, counting each time it occurs so that it only gets reported a limited number of times.
+        $msg_id = md5($message . $priority . $file . $line);
+        if (isset($previous_events[$msg_id])) {
+            $previous_events[$msg_id]++;
+            if ($previous_events[$msg_id] == 2) {
+                $this->logMsg(sprintf('%s (Event repeated more than %s times)', $message, $previous_events[$msg_id]), $priority, $file, $line);
+            }
+            return false;
+        } else {
+            $previous_events[$msg_id] = 1;
+        }
+        
         // Data to be stored for a log event.
-        $event = array();
-        $event['date'] = date('Y-m-d H:i:s');
-        $event['remote ip'] = getRemoteAddr();
-        if (substr(PHP_OS, 0, 3) != 'WIN') {
-            $event['pid'] = posix_getpid();
-        }
-        $event['type'] = $this->logPriorityToString($priority);
-        $event['file:line'] = "$file : $line";
-        preg_match_all('/(<[^>\s]{7,})[^>]*>/', $message, $strip_tags_allow); // <...> with lots of chars maybe we don't want stripped.
-        $event['message'] = strip_tags(preg_replace('/\s+/', ' ', $message), (!empty($strip_tags_allow[1]) ? join('> ', $strip_tags_allow[1]) . '>' : null));
-        $event_str = '[' . join('] [', $event) . ']';
+        $event = array(
+            'date'      => date('Y-m-d H:i:s'),
+            'remote ip' => getRemoteAddr(),
+            'pid'       => (substr(PHP_OS, 0, 3) != 'WIN' ? posix_getpid() : ''),
+            'type'      => $this->logPriorityToString($priority),
+            'file:line' => "$file : $line",
+            'message'   => $message
+        );
 
         // FILE ACTION
         if ($this->getParam('log_file_priority') && $priority <= $this->getParam('log_file_priority')) {
+            $event_str = '[' . join('] [', $event) . ']';
             error_log($event_str . "\n", 3, $this->getParam('log_directory') . '/' . $this->getParam('log_filename'));
         }