diff --git a/lib/Controller/AOCSController.php b/lib/Controller/AOCSController.php index 4f3d8720b..980dbbaab 100644 --- a/lib/Controller/AOCSController.php +++ b/lib/Controller/AOCSController.php @@ -38,7 +38,7 @@ public function __construct( * @return DataResponse */ protected function handleError($e): DataResponse { - $this->logger->warning('An internal error or exception occurred: ['. $e->getCode() . ']' . $e->getMessage()); + $this->logger->error('An internal error or exception occurred: ' . $e->getMessage(), ['exception' => $e]); return new DataResponse(['message' => $this->n->t('An unexpected error occurred. More details can be found in the logs. Please reach out to your administration.')], Http::STATUS_INTERNAL_SERVER_ERROR); } @@ -47,7 +47,7 @@ protected function handleError($e): DataResponse { * @return DataResponse */ protected function handlePermissionError(PermissionError $e): DataResponse { - $this->logger->warning('A permission error occurred: ['. $e->getCode() . ']' . $e->getMessage()); + $this->logger->warning('A permission error occurred: ' . $e->getMessage(), ['exception' => $e]); return new DataResponse(['message' => $this->n->t('A permission error occurred. More details can be found in the logs. Please reach out to your administration.')], Http::STATUS_FORBIDDEN); } @@ -56,7 +56,7 @@ protected function handlePermissionError(PermissionError $e): DataResponse { * @return DataResponse */ protected function handleNotFoundError(NotFoundError $e): DataResponse { - $this->logger->info('A not found error occurred: ['. $e->getCode() . ']' . $e->getMessage()); + $this->logger->info('A not found error occurred: ' . $e->getMessage(), ['exception' => $e]); return new DataResponse(['message' => $this->n->t('A not found error occurred. More details can be found in the logs. Please reach out to your administration.')], Http::STATUS_NOT_FOUND); } @@ -65,7 +65,7 @@ protected function handleNotFoundError(NotFoundError $e): DataResponse { * @return DataResponse */ protected function handleBadRequestError(BadRequestError $e): DataResponse { - $this->logger->warning('An bad request was encountered: ['. $e->getCode() . ']' . $e->getMessage()); + $this->logger->warning('An bad request was encountered: ' . $e->getMessage(), ['exception' => $e]); return new DataResponse(['message' => $this->n->t('An error caused by an invalid request occurred. More details can be found in the logs. Please reach out to your administration.')], Http::STATUS_BAD_REQUEST); } diff --git a/lib/Controller/Api1Controller.php b/lib/Controller/Api1Controller.php index d70a0f649..81cb30b06 100644 --- a/lib/Controller/Api1Controller.php +++ b/lib/Controller/Api1Controller.php @@ -101,7 +101,7 @@ public function index(): DataResponse { try { return new DataResponse($this->tableService->formatTables($this->tableService->findAll($this->userId))); } catch (InternalError|Exception $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } @@ -126,7 +126,7 @@ public function createTable(string $title, ?string $emoji, string $template = 'c try { return new DataResponse($this->tableService->create($title, $template, $emoji)->jsonSerialize()); } catch (InternalError|Exception $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } @@ -183,15 +183,15 @@ public function getTable(int $tableId): DataResponse { try { return new DataResponse($this->tableService->find($tableId)->jsonSerialize()); } catch (PermissionError $e) { - $this->logger->warning('A permission error occurred: ' . $e->getMessage()); + $this->logger->warning('A permission error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_FORBIDDEN); } catch (NotFoundError $e) { - $this->logger->info('A not found error occurred: ' . $e->getMessage()); + $this->logger->info('A not found error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_NOT_FOUND); } catch (InternalError|Exception $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } @@ -218,15 +218,15 @@ public function updateTable(int $tableId, ?string $title = null, ?string $emoji try { return new DataResponse($this->tableService->update($tableId, $title, $emoji, null, $archived, $this->userId)->jsonSerialize()); } catch (PermissionError $e) { - $this->logger->warning('A permission error occurred: ' . $e->getMessage()); + $this->logger->warning('A permission error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_FORBIDDEN); } catch (NotFoundError $e) { - $this->logger->info('A not found error occurred: ' . $e->getMessage()); + $this->logger->info('A not found error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_NOT_FOUND); } catch (InternalError|Exception $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } @@ -250,15 +250,15 @@ public function deleteTable(int $tableId): DataResponse { try { return new DataResponse($this->tableService->delete($tableId)->jsonSerialize()); } catch (PermissionError $e) { - $this->logger->warning('A permission error occurred: ' . $e->getMessage()); + $this->logger->warning('A permission error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_FORBIDDEN); } catch (NotFoundError $e) { - $this->logger->info('A not found error occurred: ' . $e->getMessage()); + $this->logger->info('A not found error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_NOT_FOUND); } catch (InternalError|Exception $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } @@ -284,15 +284,15 @@ public function indexViews(int $tableId): DataResponse { try { return new DataResponse($this->viewService->formatViews($this->viewService->findAll($this->tableService->find($tableId)))); } catch (PermissionError $e) { - $this->logger->warning('A permission error occurred: ' . $e->getMessage()); + $this->logger->warning('A permission error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_FORBIDDEN); } catch (NotFoundError $e) { - $this->logger->info('A not found error occurred: ' . $e->getMessage()); + $this->logger->info('A not found error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_NOT_FOUND); } catch (InternalError|Exception $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } @@ -319,11 +319,11 @@ public function createView(int $tableId, string $title, ?string $emoji): DataRes try { return new DataResponse($this->viewService->create($title, $emoji, $this->tableService->find($tableId))->jsonSerialize()); } catch (PermissionError $e) { - $this->logger->warning('A permission error occurred: '.$e->getMessage()); + $this->logger->warning('A permission error occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_FORBIDDEN); } catch (InternalError|Exception $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } @@ -347,15 +347,15 @@ public function getView(int $viewId): DataResponse { try { return new DataResponse($this->viewService->find($viewId)->jsonSerialize()); } catch (PermissionError $e) { - $this->logger->warning('A permission error occurred: '.$e->getMessage()); + $this->logger->warning('A permission error occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_FORBIDDEN); } catch (InternalError $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } catch (NotFoundError $e) { - $this->logger->info('A not found error occurred: ' . $e->getMessage()); + $this->logger->info('A not found error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_NOT_FOUND); } @@ -380,11 +380,11 @@ public function updateView(int $viewId, array $data): DataResponse { try { return new DataResponse($this->viewService->update($viewId, $data)->jsonSerialize()); } catch (PermissionError $e) { - $this->logger->warning('A permission error occurred: '.$e->getMessage()); + $this->logger->warning('A permission error occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_FORBIDDEN); } catch (InternalError|Exception $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } @@ -408,15 +408,15 @@ public function deleteView(int $viewId): DataResponse { try { return new DataResponse($this->viewService->delete($viewId)->jsonSerialize()); } catch (PermissionError $e) { - $this->logger->warning('A permission error occurred: '.$e->getMessage()); + $this->logger->warning('A permission error occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_FORBIDDEN); } catch (InternalError $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } catch (NotFoundError $e) { - $this->logger->info('A not found error occurred: ' . $e->getMessage()); + $this->logger->info('A not found error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_NOT_FOUND); } @@ -442,15 +442,15 @@ public function getShare(int $shareId): DataResponse { try { return new DataResponse($this->shareService->find($shareId)->jsonSerialize()); } catch (PermissionError $e) { - $this->logger->warning('A permission error occurred: '.$e->getMessage()); + $this->logger->warning('A permission error occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_FORBIDDEN); } catch (InternalError $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } catch (NotFoundError $e) { - $this->logger->info('A not found error occurred: ' . $e->getMessage()); + $this->logger->info('A not found error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_NOT_FOUND); } @@ -473,7 +473,7 @@ public function indexViewShares(int $viewId): DataResponse { try { return new DataResponse($this->shareService->formatShares($this->shareService->findAll('view', $viewId))); } catch (InternalError $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } @@ -496,7 +496,7 @@ public function indexTableShares(int $tableId): DataResponse { try { return new DataResponse($this->shareService->formatShares($this->shareService->findAll('table', $tableId))); } catch (InternalError $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } @@ -541,15 +541,15 @@ public function createShare( try { return new DataResponse($this->shareService->create($nodeId, $nodeType, $receiver, $receiverType, $permissionRead, $permissionCreate, $permissionUpdate, $permissionDelete, $permissionManage, $displayMode)->jsonSerialize()); } catch (PermissionError $e) { - $this->logger->warning('A permission error occurred: '.$e->getMessage()); + $this->logger->warning('A permission error occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_FORBIDDEN); } catch (InternalError $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } catch (NotFoundError $e) { - $this->logger->info('A not found error occurred: ' . $e->getMessage()); + $this->logger->info('A not found error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_NOT_FOUND); } @@ -573,15 +573,15 @@ public function deleteShare(int $shareId): DataResponse { try { return new DataResponse($this->shareService->delete($shareId)->jsonSerialize()); } catch (PermissionError $e) { - $this->logger->warning('A permission error occurred: '.$e->getMessage()); + $this->logger->warning('A permission error occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_FORBIDDEN); } catch (InternalError $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } catch (NotFoundError $e) { - $this->logger->info('A not found error occurred: ' . $e->getMessage()); + $this->logger->info('A not found error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_NOT_FOUND); } @@ -607,15 +607,15 @@ public function updateSharePermissions(int $shareId, string $permissionType, boo try { return new DataResponse($this->shareService->updatePermission($shareId, $permissionType, $permissionValue)->jsonSerialize()); } catch (PermissionError $e) { - $this->logger->warning('A permission error occurred: '.$e->getMessage()); + $this->logger->warning('A permission error occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_FORBIDDEN); } catch (InternalError $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } catch (NotFoundError $e) { - $this->logger->info('A not found error occurred: ' . $e->getMessage()); + $this->logger->info('A not found error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_NOT_FOUND); } @@ -656,15 +656,15 @@ public function updateShareDisplayMode(int $shareId, int $displayMode, string $t try { return new DataResponse($this->shareService->updateDisplayMode($shareId, $displayMode, $userId)->jsonSerialize()); } catch (InternalError $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } catch (NotFoundError $e) { - $this->logger->info('A not found error occurred: ' . $e->getMessage()); + $this->logger->info('A not found error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_NOT_FOUND); } catch (PermissionError $e) { - $this->logger->warning('A permission error occurred: '.$e->getMessage()); + $this->logger->warning('A permission error occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_FORBIDDEN); } @@ -692,11 +692,11 @@ public function indexTableColumns(int $tableId, ?int $viewId): DataResponse { try { return new DataResponse($this->columnService->formatColumns($this->columnService->findAllByTable($tableId, $viewId))); } catch (PermissionError $e) { - $this->logger->warning('A permission error occurred: '.$e->getMessage()); + $this->logger->warning('A permission error occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_FORBIDDEN); } catch (InternalError $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } @@ -721,15 +721,15 @@ public function indexViewColumns(int $viewId): DataResponse { try { return new DataResponse($this->columnService->formatColumns($this->columnService->findAllByView($viewId))); } catch (PermissionError $e) { - $this->logger->warning('A permission error occurred: '.$e->getMessage()); + $this->logger->warning('A permission error occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_FORBIDDEN); } catch (InternalError $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } catch (NotFoundError $e) { - $this->logger->info('A not found error occurred: ' . $e->getMessage()); + $this->logger->info('A not found error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_NOT_FOUND); } @@ -842,15 +842,15 @@ public function createColumn( $selectedViewIds )->jsonSerialize()); } catch (PermissionError $e) { - $this->logger->warning('A permission error occurred: '.$e->getMessage()); + $this->logger->warning('A permission error occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_FORBIDDEN); } catch (InternalError $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } catch (DoesNotExistException $e) { - $this->logger->info('A not found error occurred: ' . $e->getMessage()); + $this->logger->info('A not found error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_NOT_FOUND); } @@ -954,7 +954,7 @@ public function updateColumn( ); return new DataResponse($item->jsonSerialize()); } catch (InternalError $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } @@ -978,15 +978,15 @@ public function getColumn(int $columnId): DataResponse { try { return new DataResponse($this->columnService->find($columnId)->jsonSerialize()); } catch (PermissionError $e) { - $this->logger->warning('A permission error occurred: ' . $e->getMessage()); + $this->logger->warning('A permission error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_FORBIDDEN); } catch (NotFoundError $e) { - $this->logger->info('A not found error occurred: ' . $e->getMessage()); + $this->logger->info('A not found error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_NOT_FOUND); } catch (InternalError|Exception $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } @@ -1010,15 +1010,15 @@ public function deleteColumn(int $columnId): DataResponse { try { return new DataResponse($this->columnService->delete($columnId)->jsonSerialize()); } catch (PermissionError $e) { - $this->logger->warning('A permission error occurred: ' . $e->getMessage()); + $this->logger->warning('A permission error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_FORBIDDEN); } catch (NotFoundError $e) { - $this->logger->info('A not found error occurred: ' . $e->getMessage()); + $this->logger->info('A not found error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_NOT_FOUND); } catch (InternalError|Exception $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } @@ -1044,11 +1044,11 @@ public function indexTableRowsSimple(int $tableId, ?int $limit, ?int $offset): D try { return new DataResponse($this->v1Api->getData($tableId, $limit, $offset, $this->userId)); } catch (PermissionError $e) { - $this->logger->warning('A permission error occurred: ' . $e->getMessage()); + $this->logger->warning('A permission error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_FORBIDDEN); } catch (InternalError|Exception $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } @@ -1074,11 +1074,11 @@ public function indexTableRows(int $tableId, ?int $limit, ?int $offset): DataRes try { return new DataResponse($this->rowService->formatRows($this->rowService->findAllByTable($tableId, $this->userId, $limit, $offset))); } catch (PermissionError $e) { - $this->logger->warning('A permission error occurred: ' . $e->getMessage()); + $this->logger->warning('A permission error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_FORBIDDEN); } catch (InternalError|Exception $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } @@ -1104,11 +1104,11 @@ public function indexViewRows(int $viewId, ?int $limit, ?int $offset): DataRespo try { return new DataResponse($this->rowService->formatRows($this->rowService->findAllByView($viewId, $this->userId, $limit, $offset))); } catch (PermissionError $e) { - $this->logger->warning('A permission error occurred: ' . $e->getMessage()); + $this->logger->warning('A permission error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_FORBIDDEN); } catch (InternalError|Exception $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } @@ -1149,11 +1149,11 @@ public function createRowInView(int $viewId, $data): DataResponse { try { return new DataResponse($this->rowService->create(null, $viewId, $dataNew)->jsonSerialize()); } catch (PermissionError $e) { - $this->logger->warning('A permission error occurred: ' . $e->getMessage()); + $this->logger->warning('A permission error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_FORBIDDEN); } catch (InternalError|Exception $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } @@ -1195,11 +1195,11 @@ public function createRowInTable(int $tableId, $data): DataResponse { try { return new DataResponse($this->rowService->create($tableId, null, $dataNew)->jsonSerialize()); } catch (PermissionError $e) { - $this->logger->warning('A permission error occurred: ' . $e->getMessage()); + $this->logger->warning('A permission error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_FORBIDDEN); } catch (InternalError|Exception $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } @@ -1223,15 +1223,15 @@ public function getRow(int $rowId): DataResponse { try { return new DataResponse($this->rowService->find($rowId)->jsonSerialize()); } catch (PermissionError $e) { - $this->logger->warning('A permission error occurred: ' . $e->getMessage()); + $this->logger->warning('A permission error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_FORBIDDEN); } catch (InternalError $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } catch (NotFoundError $e) { - $this->logger->info('A not found error occurred: ' . $e->getMessage()); + $this->logger->info('A not found error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_NOT_FOUND); } @@ -1274,7 +1274,7 @@ public function updateRow(int $rowId, ?int $viewId, $data): DataResponse { try { return new DataResponse($this->rowService->updateSet($rowId, $viewId, $dataNew, $this->userId)->jsonSerialize()); } catch (InternalError $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } @@ -1299,15 +1299,15 @@ public function deleteRow(int $rowId): DataResponse { try { return new DataResponse($this->rowService->delete($rowId, null, $this->userId)->jsonSerialize()); } catch (PermissionError $e) { - $this->logger->warning('A permission error occurred: ' . $e->getMessage()); + $this->logger->warning('A permission error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_FORBIDDEN); } catch (InternalError $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } catch (NotFoundError $e) { - $this->logger->info('A not found error occurred: ' . $e->getMessage()); + $this->logger->info('A not found error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_NOT_FOUND); } @@ -1332,15 +1332,15 @@ public function deleteRowByView(int $rowId, int $viewId): DataResponse { try { return new DataResponse($this->rowService->delete($rowId, $viewId, $this->userId)->jsonSerialize()); } catch (PermissionError $e) { - $this->logger->warning('A permission error occurred: ' . $e->getMessage()); + $this->logger->warning('A permission error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_FORBIDDEN); } catch (InternalError $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } catch (NotFoundError $e) { - $this->logger->info('A not found error occurred: ' . $e->getMessage()); + $this->logger->info('A not found error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_NOT_FOUND); } @@ -1365,15 +1365,15 @@ public function importInTable(int $tableId, string $path, bool $createMissingCol try { return new DataResponse($this->importService->import($tableId, null, $path, $createMissingColumns)); } catch (PermissionError $e) { - $this->logger->warning('A permission error occurred: ' . $e->getMessage()); + $this->logger->warning('A permission error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_FORBIDDEN); } catch (InternalError|MultipleObjectsReturnedException $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } catch (NotFoundError|DoesNotExistException $e) { - $this->logger->info('A not found error occurred: ' . $e->getMessage()); + $this->logger->info('A not found error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_NOT_FOUND); } @@ -1398,15 +1398,15 @@ public function importInView(int $viewId, string $path, bool $createMissingColum try { return new DataResponse($this->importService->import(null, $viewId, $path, $createMissingColumns)); } catch (PermissionError $e) { - $this->logger->warning('A permission error occurred: ' . $e->getMessage()); + $this->logger->warning('A permission error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_FORBIDDEN); } catch (InternalError|MultipleObjectsReturnedException $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } catch (NotFoundError|DoesNotExistException $e) { - $this->logger->info('A not found error occurred: ' . $e->getMessage()); + $this->logger->info('A not found error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_NOT_FOUND); } @@ -1440,15 +1440,15 @@ public function createTableShare(int $tableId, string $receiver, string $receive try { return new DataResponse($this->shareService->create($tableId, 'table', $receiver, $receiverType, $permissionRead, $permissionCreate, $permissionUpdate, $permissionDelete, $permissionManage, 0)->jsonSerialize()); } catch (PermissionError $e) { - $this->logger->warning('A permission error occurred: '.$e->getMessage()); + $this->logger->warning('A permission error occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_FORBIDDEN); } catch (InternalError $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } catch (NotFoundError $e) { - $this->logger->info('A not found error occurred: ' . $e->getMessage()); + $this->logger->info('A not found error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_NOT_FOUND); } @@ -1560,15 +1560,15 @@ public function createTableColumn( ); return new DataResponse($item->jsonSerialize()); } catch (PermissionError $e) { - $this->logger->warning('A permission error occurred: ' . $e->getMessage()); + $this->logger->warning('A permission error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_FORBIDDEN); } catch (InternalError $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } catch (DoesNotExistException $e) { - $this->logger->info('A not found error occurred: ' . $e->getMessage()); + $this->logger->info('A not found error occurred: ' . $e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_NOT_FOUND); } diff --git a/lib/Controller/ApiGeneralController.php b/lib/Controller/ApiGeneralController.php index cd782a258..5ba7f56ae 100644 --- a/lib/Controller/ApiGeneralController.php +++ b/lib/Controller/ApiGeneralController.php @@ -53,7 +53,7 @@ public function index(): DataResponse { $views = $this->viewService->formatViews($this->viewService->findSharedViewsWithMe($this->userId)); return new DataResponse([ 'tables' => $tables, 'views' => $views ]); } catch (InternalError|Exception $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); } diff --git a/lib/Controller/Errors.php b/lib/Controller/Errors.php index 44ddb3db8..a55ac5e96 100644 --- a/lib/Controller/Errors.php +++ b/lib/Controller/Errors.php @@ -15,15 +15,15 @@ protected function handleError(Closure $callback): DataResponse { try { return new DataResponse($callback()); } catch (PermissionError $e) { - $this->logger->warning('A permission error accured: '.$e->getMessage()); + $this->logger->warning('A permission error accured: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_FORBIDDEN); } catch (NotFoundError $e) { - $this->logger->warning('A not found error accured: '.$e->getMessage()); + $this->logger->warning('A not found error accured: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_NOT_FOUND); } catch (InternalError|\Exception $e) { - $this->logger->warning('An internal error or exception occurred: '.$e->getMessage()); + $this->logger->error('An internal error or exception occurred: '.$e->getMessage(), ['exception' => $e]); $message = ['message' => $e->getMessage()]; return new DataResponse($message, Http::STATUS_INTERNAL_SERVER_ERROR); }