beu
/
TrackManiaControl
1
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity

Add a setting to disable reports on maniacontrol.com

This commit is contained in:
Beu 2022-05-17 16:29:56 +02:00
parent f6a417bea5
commit 9959373343
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/ErrorHandler.php
View File

@ -20,10 +20,11 @@ class ErrorHandler {
/* /*
* Constants * Constants
*/ */
const MC_DEBUG_NOTICE = 'ManiaControl.DebugNotice'; const MC_DEBUG_NOTICE = 'ManiaControl.DebugNotice';
const SETTING_RESTART_ON_EXCEPTION = 'Automatically restart on Exceptions'; const SETTING_RESTART_ON_EXCEPTION = 'Automatically restart on Exceptions';
const LOG_SUPPRESSED_ERRORS = false; const SETTING_REPORT_ON_MANIACONTROLCOM = 'Report errors on Maniacontrol.com';
const LONG_LOOP_REPORT_TIME = 5; const LOG_SUPPRESSED_ERRORS = false;
const LONG_LOOP_REPORT_TIME = 5;
/* /*
* Private properties * Private properties
@ -49,6 +50,7 @@ class ErrorHandler {
*/ */
public function init() { public function init() {
$this->maniaControl->getSettingManager()->initSetting($this, self::SETTING_RESTART_ON_EXCEPTION, true); $this->maniaControl->getSettingManager()->initSetting($this, self::SETTING_RESTART_ON_EXCEPTION, true);
$this->maniaControl->getSettingManager()->initSetting($this, self::SETTING_REPORT_ON_MANIACONTROLCOM, true);
} }
/** /**
@ -113,7 +115,9 @@ class ErrorHandler {
} }
Logger::log($logMessage); Logger::log($logMessage);
if (!DEV_MODE && !$isUserError && !$suppressed) { $settingManager = $this->maniaControl->getSettingManager();
if (!DEV_MODE && !$isUserError && !$suppressed && (!$settingManager || $settingManager->getSettingValue($this, self::SETTING_REPORT_ON_MANIACONTROLCOM))) {
// Report error // Report error
$report = array(); $report = array();
$report['Type'] = 'Error'; $report['Type'] = 'Error';
@ -472,7 +476,9 @@ class ErrorHandler {
$logMessage = $message . PHP_EOL . 'Class: ' . $exceptionClass . PHP_EOL . 'Trace:' . PHP_EOL . $traceString; $logMessage = $message . PHP_EOL . 'Class: ' . $exceptionClass . PHP_EOL . 'Trace:' . PHP_EOL . $traceString;
Logger::log($logMessage); Logger::log($logMessage);
if (!DEV_MODE) { $settingManager = $this->maniaControl->getSettingManager();
if (!DEV_MODE && (!$settingManager || $settingManager->getSettingValue($this, self::SETTING_REPORT_ON_MANIACONTROLCOM))) {
$report = array(); $report = array();
$report['Type'] = 'Exception'; $report['Type'] = 'Exception';
$report['Message'] = $message; $report['Message'] = $message;
@ -503,7 +509,7 @@ class ErrorHandler {
$report['ServerLogin'] = $server->login; $report['ServerLogin'] = $server->login;
} }
if (($settingManager = $this->maniaControl->getSettingManager()) && ($updateManager = $this->maniaControl->getUpdateManager())) { if ($settingManager && ($updateManager = $this->maniaControl->getUpdateManager())) {
$report['UpdateChannel'] = $settingManager->getSettingValue($updateManager, $updateManager::SETTING_UPDATECHECK_CHANNEL); $report['UpdateChannel'] = $settingManager->getSettingValue($updateManager, $updateManager::SETTING_UPDATECHECK_CHANNEL);
$report['ManiaControlVersion'] = ManiaControl::VERSION . ' #' . $updateManager->getBuildDate(); $report['ManiaControlVersion'] = ManiaControl::VERSION . ' #' . $updateManager->getBuildDate();
} else { } else {