Remove various superfluous timers and profilers

midasplatform · Nov 13, 2014 · d77acf6 · d77acf6
1 parent 17ed638
commit d77acf6
Show file tree

Hide file tree

Showing 15 changed files with 3 additions and 180 deletions.
diff --git a/core/AppController.php b/core/AppController.php
@@ -523,7 +523,6 @@ public function postDispatch()
     {
         parent::postDispatch();
         $this->view->json = JsonComponent::encode($this->view->json);
-        $this->view->generatedTimer = round((microtime(true) - START_TIME), 3);
         if (Zend_Registry::get('configGlobal')->environment != 'testing') {
             header('Content-Type: text/html; charset=UTF-8');
         }

diff --git a/core/Bootstrap.php b/core/Bootstrap.php
@@ -99,13 +99,7 @@ protected function _initConfig()
             }
         }
 
-        if ($configGlobal->environment == 'production') {
-            Zend_Loader::loadClass('ProductionDbProfiler', BASE_PATH.'/core/models/profiler');
-            $params['profiler'] = new ProductionDbProfiler();
-        }
-
         $db = Zend_Db::factory($configDatabase->database->adapter, $params);
-        $db->getProfiler()->setEnabled(true);
         Zend_Db_Table::setDefaultAdapter($db);
         Zend_Registry::set('dbAdapter', $db);
         Zend_Registry::set('configDatabase', $configDatabase);

diff --git a/core/GlobalController.php b/core/GlobalController.php
@@ -170,23 +170,6 @@ public function preDispatch()
     public function postDispatch()
     {
         parent::postDispatch();
-        if ($this->isDebug() && $this->getEnvironment() != 'testing') {
-            $timeEnd = microtime(true);
-            $writer = new Zend_Log_Writer_Firebug();
-            $logger = new Zend_Log($writer);
-            $logger->debug(
-                "---Timers--- Controller timer:".round(
-                    1000 * ($timeEnd - $this->_controllerTimer),
-                    3
-                )." ms - Global timer:".round(1000 * ($timeEnd - START_TIME), 3)." ms"
-            );
-
-            $logger->debug("---Memory Usage---".round((memory_get_usage() / (1024 * 1024)), 3)." MB");
-        }
-
-        if (Zend_Registry::get("configDatabase")->database->profiler == 1) {
-            $this->showProfiler();
-        }
         $this->view->addHelperPath(BASE_PATH."/core/views/helpers", "Zend_View_Helper_");
     }
 
@@ -253,60 +236,6 @@ public function loadElements()
         }
     }
 
-    /**
-     * Show profiler in the firebug console
-     */
-    public function showProfiler()
-    {
-        $writer = new Zend_Log_Writer_Firebug();
-        $logger = new Zend_Log($writer);
-        $configDatabase = Zend_Registry::get('configDatabase');
-        if ($configDatabase->database->profiler != '1') {
-            return;
-        }
-        $db = Zend_Registry::get('dbAdapter');
-
-        if (method_exists($db, "getProfiler")) {
-            $profiler = $db->getProfiler();
-            $totalTime = $profiler->getTotalElapsedSecs();
-            $queryCount = $profiler->getTotalNumQueries();
-            if ($queryCount == 0) {
-                return;
-            }
-        }
-
-        $longestTime = 0;
-        $longestQuery = null;
-        if (isset($profiler) && !empty($profiler)) {
-            $querys = $profiler->getQueryProfiles();
-            if (!empty($querys)) {
-                foreach ($profiler->getQueryProfiles() as $query) {
-                    if ($query->getElapsedSecs() > $longestTime) {
-                        $longestTime = $query->getElapsedSecs();
-                        $longestQuery = $query->getQuery();
-                    }
-                }
-                $stats = '--- Profiler --- Executed '.$queryCount.' queries in '.round(
-                        1000 * $totalTime,
-                        3
-                    ).' ms';
-                $stats .= ' Longest query length: '.round(1000 * $longestTime, 3).' ms : '.$longestQuery;
-                $logger->log(str_replace("'", "`", $stats), Zend_Log::INFO);
-
-                foreach ($profiler->getQueryProfiles() as $query) {
-                    $logger->log(
-                        str_replace(
-                            "'",
-                            "`",
-                            round(1000 * ($query->getElapsedSecs()), 3)." ms | ".$query->getQuery()
-                        ),
-                        Zend_Log::INFO
-                    );
-                }
-            }
-        }
-    }
-
     /**
      * Is Debug mode ON
      *

diff --git a/core/configs/database.ini b/core/configs/database.ini
@@ -8,7 +8,6 @@ database.params.unix_socket = ""
 database.params.dbname = "midas"
 database.params.username = "root"
 database.params.password = ""
-database.profiler = "0"
 version = ""
 
 [development]
@@ -19,7 +18,6 @@ database.params.unix_socket = ""
 database.params.dbname = "midas"
 database.params.username = "root"
 database.params.password = ""
-database.profiler = "1"
 version = ""
 
 [testing]
@@ -30,5 +28,4 @@ database.params.unix_socket = ""
 database.params.dbname = "midas_test"
 database.params.username = "root"
 database.params.password = ""
-database.profiler = "1"
 version = ""
diff --git a/core/controllers/ErrorController.php b/core/controllers/ErrorController.php
@@ -40,14 +40,9 @@ public function init()
         $session = new Zend_Session_Namespace('Auth_User');
         $db = Zend_Registry::get('dbAdapter');
 
-        if (method_exists($db, "getProfiler")) {
-            $profiler = $db->getProfiler();
-        } else {
-            $profiler = new Zend_Db_Profiler();
-        }
         $environment = Zend_Registry::get('configGlobal')->environment;
         $this->_environment = $environment;
-        $this->Component->NotifyError->initNotifier($environment, $error, $session, $profiler, $_SERVER);
+        $this->Component->NotifyError->initNotifier($environment, $error, $session, $_SERVER);
 
         $this->_error = $error;
 

diff --git a/core/controllers/components/NotifyErrorComponent.php b/core/controllers/components/NotifyErrorComponent.php
@@ -24,20 +24,17 @@ class NotifyErrorComponent extends AppComponent
     protected $_environment;
     protected $_session;
     protected $_error;
-    protected $_profiler;
 
     /** Init */
     public function initNotifier(
         $environment,
         ArrayObject $error,
         Zend_Session_Namespace $session,
-        Zend_Db_Profiler $profiler,
         array $server
     ) {
         $this->_environment = $environment;
         $this->_error = $error;
         $this->_session = $session;
-        $this->_profiler = $profiler;
         $this->_server = $server;
     }
 
@@ -236,11 +233,6 @@ public function getFullErrorMessage()
         }
         $message .= "\n";
 
-        if ($this->_profiler->getLastQueryProfile() !== false) {
-            $query = $this->_profiler->getLastQueryProfile()->getQuery();
-            $message .= "Last database query: ".$query."\n\n";
-        }
-
         return $message;
     }
 

diff --git a/core/layouts/layout.phtml b/core/layouts/layout.phtml
@@ -348,7 +348,7 @@ echo $this->doctype().PHP_EOL;
             <div class="SubMainContent">
                 <?php
                 if (isset($this->header)) {
-                    echo "<div class='viewHeader'><span class='headerSpan'>{$this->header} </span></div>";
+                    echo "<div class='viewHeader'><span class='headerSpan'>{$this->header}</span></div>";
                 }
                 ?>
                 <div class="viewWrapper">
@@ -376,10 +376,6 @@ echo $this->doctype().PHP_EOL;
                 'UTF-8'
             ); ?> - &copy; <?php echo date('Y'); ?>
             <a href="http://www.kitware.com">Kitware</a> -
-            <?php
-            echo $this->t('Generated in').' '.$this->generatedTimer.' s';
-            ?>
-            -
             <a href="https://github.com/midasplatform/Midas/issues"><?php echo $this->t('Report bug'); ?></a>
         </div>
     </div>

diff --git a/core/models/profiler/ProductionDbProfiler.php b/core/models/profiler/ProductionDbProfiler.php
diff --git a/index.php b/index.php
@@ -34,8 +34,6 @@
 define('BASE_PATH', realpath(dirname(__FILE__)));
 require_once BASE_PATH.'/vendor/autoload.php';
 require_once BASE_PATH.'/core/include.php';
-require_once 'Zend/Application.php';
-define('START_TIME', microtime(true));
 
 if (!is_writable(LOCAL_CONFIGS_PATH)) {
     echo '<p>To use Midas Platform, the folder "'.LOCAL_CONFIGS_PATH.'" must be writable by your web server.</p>';

diff --git a/tests/ControllerTestCase.php b/tests/ControllerTestCase.php
@@ -272,9 +272,8 @@ public function dispatchUrI($uri, $userDao = null, $withException = false, $asse
             $errorComponent = new NotifyErrorComponent();
             $session = new Zend_Session_Namespace('Auth_User');
             $db = Zend_Registry::get('dbAdapter');
-            $profiler = $db->getProfiler();
             $environment = 'testing';
-            $errorComponent->initNotifier($environment, $error, $session, $profiler, $_SERVER);
+            $errorComponent->initNotifier($environment, $error, $session, $_SERVER);
 
             $this->fail($errorComponent->getFullErrorMessage());
         }

diff --git a/tests/DatabaseSetup.php b/tests/DatabaseSetup.php
@@ -73,9 +73,6 @@ function loadDbAdapter($testConfigDir, $dbType)
         }
     }
     $db = Zend_Db::factory($configDatabase->database->adapter, $params);
-    if ($configDatabase->database->profiler == '1') {
-        $db->getProfiler()->setEnabled(true);
-    }
     Zend_Db_Table::setDefaultAdapter($db);
     Zend_Registry::set('dbAdapter', $db);
     Zend_Registry::set('configDatabase', $configDatabase);
@@ -220,7 +217,6 @@ function releaseLock($dbType)
 
 require_once BASE_PATH.'/vendor/autoload.php';
 require_once BASE_PATH.'/core/include.php';
-define('START_TIME', microtime(true));
 
 Zend_Session::$_unitTestEnabled = true;
 Zend_Session::start();
@@ -233,11 +229,6 @@ function releaseLock($dbType)
             'filterName' => 'Priority',
             'filterParams' => array('priority' => Zend_Log::DEBUG),
         ),
-        array(
-            'writerName' => 'Firebug',
-            'filterName' => 'Priority',
-            'filterParams' => array('priority' => Zend_Log::DEBUG),
-        ),
     )
 );
 

diff --git a/tests/TestsBootstrap.php b/tests/TestsBootstrap.php
@@ -30,7 +30,6 @@
 
 require_once BASE_PATH.'/vendor/autoload.php';
 require_once BASE_PATH.'/core/include.php';
-define('START_TIME', microtime(true));
 
 Zend_Session::$_unitTestEnabled = true;
 Zend_Session::start();
@@ -82,9 +81,6 @@
     $params['unix_socket'] = $configDatabase->database->params->unix_socket;
 }
 $db = Zend_Db::factory($configDatabase->database->adapter, $params);
-if ($configDatabase->database->profiler == '1') {
-    $db->getProfiler()->setEnabled(true);
-}
 Zend_Db_Table::setDefaultAdapter($db);
 Zend_Registry::set('dbAdapter', $db);
 Zend_Registry::set('configDatabase', $configDatabase);
@@ -129,11 +125,6 @@
             'filterName' => 'Priority',
             'filterParams' => array('priority' => Zend_Log::INFO),
         ),
-        array(
-            'writerName' => 'Firebug',
-            'filterName' => 'Priority',
-            'filterParams' => array('priority' => Zend_Log::INFO),
-        ),
     )
 );
 

diff --git a/tests/travis/mysql.ini b/tests/travis/mysql.ini
@@ -8,5 +8,4 @@ database.params.unix_socket = ""
 database.params.dbname = "midas_test"
 database.params.username = "root"
 database.params.password = ""
-database.profiler = "1"
 version = ""
diff --git a/tests/travis/pgsql.ini b/tests/travis/pgsql.ini
@@ -8,5 +8,4 @@ database.params.unix_socket =
 database.params.dbname = "midas_test"
 database.params.username = "postgres"
 database.params.password = ""
-database.profiler = "1"
 version = ""
diff --git a/tests/travis/sqlite.ini b/tests/travis/sqlite.ini
@@ -8,5 +8,4 @@ database.params.unix_socket = ""
 database.params.dbname = ${TRAVIS_BUILD_DIR}/midas_test.db
 database.params.username = ""
 database.params.password = ""
-database.profiler = "1"
 version = ""