diff options
author | Julius Härtl <jus@bitgrid.net> | 2019-05-20 16:19:07 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-20 16:19:07 +0300 |
commit | 18c5b105ea4fbf30c3a7b23b6ef0fd415440be95 (patch) | |
tree | 4bbe0eb13dfb3353a62d73575dea0ef2437581b4 /lib | |
parent | 9c5e64ed189edc33a5b48c670b4ea38ce94a8c7a (diff) | |
parent | f7c2478425d8aed70d28957b9e7be147791e4557 (diff) |
Add logging to WOPI Controller and preview providers (#507)
Add logging to WOPI Controller and preview providers
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Controller/WopiController.php | 4 | ||||
-rw-r--r-- | lib/Preview/Office.php | 12 |
2 files changed, 15 insertions, 1 deletions
diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php index 7484ec44..d78a9961 100644 --- a/lib/Controller/WopiController.php +++ b/lib/Controller/WopiController.php @@ -131,6 +131,7 @@ class WopiController extends Controller { $userFolder = $this->rootFolder->getUserFolder($wopi->getOwnerUid()); $file = $userFolder->getById($fileId)[0]; } catch (\Exception $e) { + $this->logger->logException($e, ['app' => 'richdocuments']); return new JSONResponse([], Http::STATUS_FORBIDDEN); } } @@ -233,6 +234,7 @@ class WopiController extends Controller { $response->addHeader('Content-Type', 'application/octet-stream'); return $response; } catch (\Exception $e) { + $this->logger->logException($e, ['level' => ILogger::ERROR, 'app' => 'richdocuments', 'message' => 'getFile failed']); return new JSONResponse([], Http::STATUS_FORBIDDEN); } } @@ -341,6 +343,7 @@ class WopiController extends Controller { return new JSONResponse(['LastModifiedTime' => Helper::toISO8601($file->getMTime())]); } catch (\Exception $e) { + $this->logger->logException($e, ['level' => ILogger::ERROR, 'app' => 'richdocuments', 'message' => 'getFile failed']); return new JSONResponse([], Http::STATUS_INTERNAL_SERVER_ERROR); } } @@ -430,6 +433,7 @@ class WopiController extends Controller { return new JSONResponse([ 'Name' => $file->getName(), 'Url' => $url ], Http::STATUS_OK); } catch (\Exception $e) { + $this->logger->logException($e, ['level' => ILogger::ERROR, 'app' => 'richdocuments', 'message' => 'putRelativeFile failed']); return new JSONResponse([], Http::STATUS_INTERNAL_SERVER_ERROR); } } diff --git a/lib/Preview/Office.php b/lib/Preview/Office.php index d80c83cc..a8cf83dd 100644 --- a/lib/Preview/Office.php +++ b/lib/Preview/Office.php @@ -25,6 +25,7 @@ use OC\Preview\Provider; use OCA\Richdocuments\Capabilities; use OCP\Http\Client\IClientService; use OCP\IConfig; +use OCP\ILogger; abstract class Office extends Provider { @@ -37,10 +38,14 @@ abstract class Office extends Provider { /** @var array */ private $capabilitites; - public function __construct(IClientService $clientService, IConfig $config, Capabilities $capabilities) { + /** @var ILogger */ + private $logger; + + public function __construct(IClientService $clientService, IConfig $config, Capabilities $capabilities, ILogger $logger) { $this->clientService = $clientService; $this->config = $config; $this->capabilitites = $capabilities->getCapabilities()['richdocuments']; + $this->logger = $logger; } private function getWopiURL() { @@ -72,6 +77,11 @@ abstract class Office extends Provider { try { $response = $client->post($this->getWopiURL(). '/lool/convert-to/png', $options); } catch (\Exception $e) { + $this->logger->logException($e, [ + 'message' => 'Failed to convert file to preview', + 'level' => ILogger::INFO, + 'app' => 'richdocuments', + ]); return false; } |