Don't let the tests fail. The test user doesn't have a private key

[friendica.git] / src / Util / Profiler.php

diff --git a/src/Util/Profiler.php b/src/Util/Profiler.php
index c8c56337180fd04100e1f3673c994bf08efde667..db3e1bb97825f38f4d48cab62170377e54dc4f6b 100644 (file)
--- a/src/Util/Profiler.php
+++ b/src/Util/Profiler.php
@@ -1,7 +1,29 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Util;
 
+use Friendica\Core\Config\Cache;
+use Friendica\Core\Config\IConfig;
+use Friendica\Core\System;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
@@ -11,7 +33,7 @@ use Psr\Log\LoggerInterface;
  * A class to store profiling data
  * It can handle different logging data for specific functions or global performance measures
  *
- * It stores the data as log entries (@see LoggerInterface )
+ * It stores the data as log entries (@see LoggerInterface)
  */
 class Profiler implements ContainerInterface
 {
@@ -43,13 +65,23 @@ class Profiler implements ContainerInterface
        }
 
        /**
-        * @param bool $enabled           True, if the Profiler is enabled
-        * @param bool $renderTime        True, if the Profiler should measure the whole rendertime including functions
+        * Updates the enabling of the current profiler
+        *
+        * @param IConfig $config
         */
-       public function __construct($enabled = false, $renderTime = false)
+       public function update(IConfig $config)
        {
-               $this->enabled = $enabled;
-               $this->rendertime = $renderTime;
+               $this->enabled = $config->get('system', 'profiler');
+               $this->rendertime = $config->get('rendertime', 'callstack');
+       }
+
+       /**
+        * @param Cache $configCache The configuration cache
+        */
+       public function __construct(Cache $configCache)
+       {
+               $this->enabled = $configCache->get('system', 'profiler');
+               $this->rendertime = $configCache->get('rendertime', 'callstack');
                $this->reset();
        }
 
@@ -57,9 +89,9 @@ class Profiler implements ContainerInterface
         * Saves a timestamp for a value - f.e. a call
         * Necessary for profiling Friendica
         *
-        * @param int $timestamp the Timestamp
-        * @param string $value A value to profile
-        * @param string $callstack The callstack of the current profiling data
+        * @param int    $timestamp the Timestamp
+        * @param string $value     A value to profile
+        * @param string $callstack A callstack string, generated if absent
         */
        public function saveTimestamp($timestamp, $value, $callstack = '')
        {
@@ -67,7 +99,9 @@ class Profiler implements ContainerInterface
                        return;
                }
 
-               $duration = (float) (microtime(true) - $timestamp);
+               $callstack = $callstack ?: System::callstack(4, 1);
+
+               $duration = floatval(microtime(true) - $timestamp);
 
                if (!isset($this->performance[$value])) {
                        // Prevent ugly E_NOTICE