FuzeWorks/TracyComponent
FuzeWorks/TracyComponent
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Implemented changes requested by FuzeWorks\Application

Browse Source
This commit is contained in:
Abel Hoogeveen 2019-03-04 22:02:46 +01:00
parent bb6fa39d90
commit 4dd45c56fd
No known key found for this signature in database
GPG Key ID: 96C2234920BF4292
2 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -16,7 +16,7 @@
"require": {
"php": ">=7.1.0",
"tracy/tracy": "2.5.*",
"fuzeworks/core": "1.2.0-RC2"
"fuzeworks/core": "1.2.0-RC3"
},
"require-dev": {
"phpunit/phpunit": "^7"

40
src/FuzeWorks/TracyComponent.php
View File

@ -35,6 +35,7 @@
*/
namespace FuzeWorks;
use FuzeWorks\Exception\EventException;
use FuzeWorks\Exception\InvalidArgumentException;
use Tracy\Debugger;
@ -82,7 +83,7 @@ class TracyComponent implements iComponent
* Enables Tracy when requested to do so. Disables FuzeWorks Logger.
*
* @param Factory $container
* @throws Exception\EventException
* @throws EventException
*/
public function onCreateContainer(Factory $container)
{
@ -93,25 +94,31 @@ class TracyComponent implements iComponent
return;
}
// Disable screenLog
Events::addListener(function($event){
if (self::$enableTracy)
{
$event->setCancelled(true);
Logger::log("Cancelled FuzeWorks\Logger output");
}
else
Logger::log("Tracy is running but configured to not intercept FuzeWorks output. Ignoring...");
}, 'screenLogEvent');
// Enable Tracy. Use DEVELOPMENT mode when logger is enabled
if ($container->logger->isEnabled() == true)
$debuggerEnabled = $container->logger->isEnabled();
if ($debuggerEnabled)
Debugger::enable(Debugger::DEVELOPMENT, realpath(Core::$logDir));
else
Debugger::enable(Debugger::PRODUCTION, realpath(Core::$logDir));
// Disable FuzeWorks Logger
$container->logger->disable();
Logger::disableScreenLog();
// Reset exception handlers
set_error_handler(array('\FuzeWorks\Core', 'errorHandler'), E_ALL);
set_exception_handler(array('\FuzeWorks\Core', 'exceptionHandler'));
// Register exception handler
Core::addErrorHandler(['\Tracy\Debugger', 'errorHandler'], Priority::LOW);
// Tracy has an annoying default error 500 page.
// This page will be suppressed when in production mode.
if ($debuggerEnabled)
{
Core::addExceptionHandler(['\Tracy\Debugger', 'exceptionHandler'], Priority::LOW);
}
else
Core::addExceptionHandler([$this, 'exceptionHandler'], Priority::LOW);
// Enable bridges
GitTracyBridge::register();
@ -119,6 +126,11 @@ class TracyComponent implements iComponent
self::$enabled = true;
}
public function exceptionHandler($exception, $exit = true)
{
Debugger::getLogger()->log($exception, \Tracy\Logger::EXCEPTION);
}
/**
* Calls a static method in the Debugger class
*