Skip to content

Commit 5305b27

Browse files
committed
Update Project at Wed Mar 29 11:19:05 +07 2023
1 parent 967ed42 commit 5305b27

File tree

3 files changed

+16
-18
lines changed

3 files changed

+16
-18
lines changed

helpers/common.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ function bear_str_length($str)
4141
/**
4242
* Function __get_error_message__
4343
*
44-
* @param \Exception $e
44+
* @param \Exception|\Throwable $e
4545
*
4646
* @return string
4747
* @author : 713uk13m <dev@nguyenanhung.com>
@@ -57,7 +57,7 @@ function __get_error_message__($e)
5757
/**
5858
* Function __get_error_trace__
5959
*
60-
* @param \Exception $e
60+
* @param \Exception|\Throwable $e
6161
*
6262
* @return string
6363
* @author : 713uk13m <dev@nguyenanhung.com>

hungng/HungNG_CI_Base_Controllers.php

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,8 @@ protected function jsonResponsePretty($response = array(), $status = 200)
205205
*/
206206
protected function errorExceptionResponse($exception)
207207
{
208-
$errorMessage = "Error Code: " . $exception->getCode() . " - Error File: " . $exception->getFile() . " - Error Line: " . $exception->getLine() . " - Error Message: " . $exception->getMessage();
209-
log_message('error', $errorMessage);
210-
log_message('error', $exception->getTraceAsString());
208+
log_message('error', __get_error_message__($exception));
209+
log_message('error', __get_error_trace__($exception));
211210

212211
$response = array();
213212
$response['code'] = StatusCodes::HTTP_BAD_REQUEST;
@@ -366,11 +365,11 @@ protected function log($name = '', $message = '', $context = array(), $inputLeve
366365
log_message($inputLevel, $name . " | Error Message: " . $message . ' | Context: ' . json_encode($context));
367366
}
368367
} catch (InvalidArgumentException $exception) {
369-
log_message('error', $exception->getMessage());
370-
log_message('error', $exception->getTraceAsString());
368+
log_message('error', __get_error_message__($exception));
369+
log_message('error', __get_error_trace__($exception));
371370
} catch (Exception $exception) {
372-
log_message('error', $exception->getMessage());
373-
log_message('error', $exception->getTraceAsString());
371+
log_message('error', __get_error_message__($exception));
372+
log_message('error', __get_error_trace__($exception));
374373
}
375374
}
376375

@@ -422,7 +421,7 @@ protected function default_base_flush_logs()
422421
$this->output->set_status_header()->set_content_type('application/json', 'utf-8')->set_output($output . PHP_EOL)->_display();
423422
exit;
424423
} catch (Exception $e) {
425-
$message = 'Code: ' . $e->getCode() . ' - File: ' . $e->getFile() . ' - Line: ' . $e->getLine() . ' - Message: ' . $e->getMessage();
424+
$message = __get_error_message__($e);
426425
log_message('error', $message);
427426
echo $message . PHP_EOL;
428427
exit;

hungng/HungNG_CI_Base_Module.php

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,8 @@ protected function jsonResponsePretty($response = array(), $status = 200)
205205
*/
206206
protected function errorExceptionResponse($exception)
207207
{
208-
$errorMessage = "Error Code: " . $exception->getCode() . " - Error File: " . $exception->getFile() . " - Error Line: " . $exception->getLine() . " - Error Message: " . $exception->getMessage();
209-
log_message('error', $errorMessage);
210-
log_message('error', $exception->getTraceAsString());
208+
log_message('error', __get_error_message__($exception));
209+
log_message('error', __get_error_trace__($exception));
211210

212211
$response = array();
213212
$response['code'] = StatusCodes::HTTP_BAD_REQUEST;
@@ -366,11 +365,11 @@ protected function log($name = '', $message = '', $context = array(), $inputLeve
366365
log_message($inputLevel, $name . " | Error Message: " . $message . ' | Context: ' . json_encode($context));
367366
}
368367
} catch (InvalidArgumentException $exception) {
369-
log_message('error', $exception->getMessage());
370-
log_message('error', $exception->getTraceAsString());
368+
log_message('error', __get_error_message__($exception));
369+
log_message('error', __get_error_trace__($exception));
371370
} catch (Exception $exception) {
372-
log_message('error', $exception->getMessage());
373-
log_message('error', $exception->getTraceAsString());
371+
log_message('error', __get_error_message__($exception));
372+
log_message('error', __get_error_trace__($exception));
374373
}
375374
}
376375

@@ -422,7 +421,7 @@ protected function default_base_flush_logs()
422421
$this->output->set_status_header()->set_content_type('application/json', 'utf-8')->set_output($output . PHP_EOL)->_display();
423422
exit;
424423
} catch (Exception $e) {
425-
$message = 'Code: ' . $e->getCode() . ' - File: ' . $e->getFile() . ' - Line: ' . $e->getLine() . ' - Message: ' . $e->getMessage();
424+
$message = __get_error_message__($e);
426425
log_message('error', $message);
427426
echo $message . PHP_EOL;
428427
exit;

0 commit comments

Comments
 (0)