little changes in error logging

This commit is contained in:
Max Pozdeev 2019-06-29 19:05:48 +03:00
parent e1b21839b2
commit 8085658e53
2 changed files with 11 additions and 8 deletions

View file

@ -803,16 +803,12 @@ function myExceptionHandler($e)
{
if(-1 == $e->getCode()) {
//thrown in myErrorHandler
error_log($e->getMessage());
echo $e->getMessage()."\n". $e->getTraceAsString();
exit;
die2($e->getMessage()."\n". $e->getTraceAsString(), $e->getMessage());
}
error_log('Exception: \''. $e->getMessage() .'\' in '. $e->getFile() .':'. $e->getLine());
echo 'Exception: \''. $e->getMessage() .'\' in '. $e->getFile() .':'. $e->getLine(); //."\n". $e->getTraceAsString();
die2('Exception: \''. $e->getMessage() .'\' in '. $e->getFile() .':'. $e->getLine());
}
catch(Exception $e) {
error_log('Exception in ExceptionHandler: \''. $e->getMessage() .'\' in '. $e->getFile() .':'. $e->getLine());
echo 'Exception in ExceptionHandler: \''. $e->getMessage() .'\' in '. $e->getFile() .':'. $e->getLine();
die2('Exception in ExceptionHandler: \''. $e->getMessage() .'\' in '. $e->getFile() .':'. $e->getLine());
}
exit;
}

View file

@ -27,7 +27,7 @@ if(Config::get('db') == 'mysql')
$db->connect(Config::get('mysql.host'), Config::get('mysql.user'), Config::get('mysql.password'), Config::get('mysql.db'));
}
catch(Exception $e) {
die("Failed to connect to mysql database: ". $e->getMessage());
die2("Failed to connect to mysql database: ". $e->getMessage());
}
$db->dq("SET NAMES utf8");
}
@ -163,4 +163,11 @@ function jsonExit($data)
exit;
}
function die2($userText, $errText = null)
{
$errText === null ? error_log($userText) : error_log($errText);
echo $userText;
exit(1);
}
?>