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

Timestamp:

Dec 25, 2013 12:47:12 AM (10 years ago)

Author:

anonymous

Message:

Merged changes to lib/SortOrder.inc.php from eli_branch; other minor changes

File:

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

trunk/lib/App.inc.php

@@ -4 +4 @@
  * For details visit the project site: <http://trac.strangecode.com/codebase/>
  * Copyright 2001-2012 Strangecode, LLC
- * 
+ *
  * This file is part of The Strangecode Codebase.
  *
@@ -11 +11 @@
  * Free Software Foundation, either version 3 of the License, or (at your option)
  * any later version.
- * 
+ *
  * The Strangecode Codebase is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along with
  * The Strangecode Codebase. If not, see <http://www.gnu.org/licenses/>.
@@ -86 +86 @@
         'session_name' => '_session',
         'session_use_cookies' => true,
-        
+
         // Pass the session-id through URLs if cookies are not enabled?
         // Disable this to prevent session ID theft.
@@ -190 +190 @@
         // Initialize default parameters.
         $this->_params = array_merge($this->_params, $this->_param_defaults);
-        
+
         // Begin timing script.
         require_once dirname(__FILE__) . '/ScriptTimer.inc.php';
@@ -362 +362 @@
             $this->setParam(array('site_url' => sprintf('%s://%s', ('on' == getenv('HTTPS') ? 'https' : 'http'), getenv('HTTP_HOST'))));
         }
-        
+
         // In case site_email isn't set, use something halfway presentable.
         if (isset($_SERVER['HTTP_HOST']) && '' != $_SERVER['HTTP_HOST'] && '' == $this->getParam('site_email')) {
@@ -375 +375 @@
         // Character set. This should also be printed in the html header template.
         header('Content-type: text/html; charset=' . $this->getParam('character_set'));
-        
+
         // Set the version of the codebase we're using.
         $codebase_version_file = dirname(__FILE__) . '/../docs/version.txt';
@@ -404 +404 @@
             $this->db->close();
         }
+        $mem_current = memory_get_usage();
+        $mem_peak = memory_get_peak_usage();
         $this->timer->stop('_app');
-        $this->logMsg(sprintf('Script ended gracefully. Execution time: %s. Number of db queries: %s.', $this->timer->getTime('_app'), $num_queries), LOG_DEBUG, __FILE__, __LINE__);
+        $this->logMsg(sprintf('Script ended gracefully. Execution time: %s. Number of db queries: %s. Memory usage: %s. Peak memory: %s.', $this->timer->getTime('_app'), $num_queries, $mem_current, $mem_peak), LOG_DEBUG, __FILE__, __LINE__);
     }
 
@@ -434 +436 @@
             return false;
         }
-        
+
         // Avoid duplicate full-stops..
         $message = trim(preg_replace('/\.{2}$/', '.', $message));
@@ -454 +456 @@
         }
     }
-    
+
     /**
      * Returns an array of the raised messages.
@@ -472 +474 @@
         return isset($_SESSION['_app'][$this->_ns]['messages']) ? $_SESSION['_app'][$this->_ns]['messages'] : array();
     }
-    
+
     /**
      * Resets the message list.
@@ -486 +488 @@
             return false;
         }
-        
+
         $_SESSION['_app'][$this->_ns]['messages'] = array();
     }
@@ -507 +509 @@
             return false;
         }
-        
+
         $messages = $this->getRaisedMessages();
         if (!empty($messages)) {
@@ -590 +592 @@
             trigger_error(sprintf('Codebase error: log directory (%s) not found or writable.', $this->getParam('log_directory')), E_USER_NOTICE);
         }
-        
+
         // Before we get any further, let's see if ANY log events are configured to be reported.
         if ((false === $this->getParam('log_file_priority') || $priority > $this->getParam('log_file_priority'))
@@ -626 +628 @@
             $site_hash = md5(empty($_SERVER['SERVER_NAME']) ? $_SERVER['SCRIPT_FILENAME'] : $_SERVER['SERVER_NAME']);
             $lock_dir = $this->getParam('tmp_dir') . "/codebase_msgs_$site_hash/";
-            // Just use the file and line for the msg_id to limit the number of possible messages 
+            // Just use the file and line for the msg_id to limit the number of possible messages
             // (the message string itself shan't be used as it may contain innumerable combinations).
             $lock_file = $lock_dir . md5($file . ':' . $line);
@@ -647 +649 @@
             }
         }
-        
+
         // Data to be stored for a log event.
         $event = array(
@@ -685 +687 @@
             mb_send_mail($this->getParam('log_to_sms_address'), $subject, $sms_msg, $headers);
         }
-    
+
         // SCREEN ACTION
         if (false !== $this->getParam('log_screen_priority') && $priority <= $this->getParam('log_screen_priority')) {
@@ -693 +695 @@
         // Restore original locale.
         setlocale(LC_TIME, $locale);
-        
+
         return true;
     }
@@ -771 +773 @@
 
     /**
-     * dropQuery() is the opposite of carryQuery(). The specified value will not appear in 
+     * dropQuery() is the opposite of carryQuery(). The specified value will not appear in
      * url()/ohref()/printHiddenSession() modified URLs unless explicitly written in.
-     * 
+     *
      * @access  public
      * @param   mixed   $query_key  The key (or keys, as an array) of the query argument to remove.