diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-07-03 23:05:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-03 23:05:58 +0200 |
| commit | f5bbe21155bfc067f4cca6c2d01fa58e0f52d2a5 (patch) | |
| tree | b31ecd3afe4d92ce6a79738cb96f72acda4ce264 | |
| parent | d1df33a19067c02d86e3cafedd78ac4561dc673b (diff) | |
| parent | 6d68d34f2f9fed526c6e48529e081b662e78cce4 (diff) | |
| download | nextcloud-server-f5bbe21155bfc067f4cca6c2d01fa58e0f52d2a5.tar.gz nextcloud-server-f5bbe21155bfc067f4cca6c2d01fa58e0f52d2a5.zip | |
Merge pull request #10093 from nextcloud/smb-log-connection-errors-13
[13] Improved logging of smb connection errors
| -rw-r--r-- | apps/dav/lib/Connector/Sabre/ObjectTree.php | 2 | ||||
| -rw-r--r-- | apps/files_external/lib/Lib/Storage/SMB.php | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/apps/dav/lib/Connector/Sabre/ObjectTree.php b/apps/dav/lib/Connector/Sabre/ObjectTree.php index 25db1d5028c..e3a3d50f1ec 100644 --- a/apps/dav/lib/Connector/Sabre/ObjectTree.php +++ b/apps/dav/lib/Connector/Sabre/ObjectTree.php @@ -160,7 +160,7 @@ class ObjectTree extends CachingTree { throw new StorageNotAvailableException(); } } catch (StorageNotAvailableException $e) { - throw new \Sabre\DAV\Exception\ServiceUnavailable('Storage is temporarily not available'); + throw new \Sabre\DAV\Exception\ServiceUnavailable('Storage is temporarily not available', 0, $e); } catch (StorageInvalidException $e) { throw new \Sabre\DAV\Exception\NotFound('Storage ' . $path . ' is invalid'); } catch (LockedException $e) { diff --git a/apps/files_external/lib/Lib/Storage/SMB.php b/apps/files_external/lib/Lib/Storage/SMB.php index c9828606ffb..8fa654ffbbf 100644 --- a/apps/files_external/lib/Lib/Storage/SMB.php +++ b/apps/files_external/lib/Lib/Storage/SMB.php @@ -139,6 +139,7 @@ class SMB extends Common implements INotifyStorage { } return $this->statCache[$path]; } catch (ConnectException $e) { + \OC::$server->getLogger()->logException($e, ['message' => 'Error while getting file info']); throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e); } } @@ -165,6 +166,7 @@ class SMB extends Common implements INotifyStorage { } }); } catch (ConnectException $e) { + \OC::$server->getLogger()->logException($e, ['message' => 'Error while getting folder content']); throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e); } } @@ -289,6 +291,7 @@ class SMB extends Common implements INotifyStorage { } catch (ForbiddenException $e) { return false; } catch (ConnectException $e) { + \OC::$server->getLogger()->logException($e, ['message' => 'Error while deleting file']); throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e); } } @@ -373,6 +376,7 @@ class SMB extends Common implements INotifyStorage { } catch (ForbiddenException $e) { return false; } catch (ConnectException $e) { + \OC::$server->getLogger()->logException($e, ['message' => 'Error while opening file']); throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e); } } @@ -399,6 +403,7 @@ class SMB extends Common implements INotifyStorage { } catch (ForbiddenException $e) { return false; } catch (ConnectException $e) { + \OC::$server->getLogger()->logException($e, ['message' => 'Error while removing folder']); throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e); } } @@ -412,6 +417,7 @@ class SMB extends Common implements INotifyStorage { } return false; } catch (ConnectException $e) { + \OC::$server->getLogger()->logException($e, ['message' => 'Error while creating file']); throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e); } } @@ -447,6 +453,7 @@ class SMB extends Common implements INotifyStorage { $this->share->mkdir($path); return true; } catch (ConnectException $e) { + \OC::$server->getLogger()->logException($e, ['message' => 'Error while creating folder']); throw new StorageNotAvailableException($e->getMessage(), $e->getCode(), $e); } catch (Exception $e) { return false; @@ -520,6 +527,7 @@ class SMB extends Common implements INotifyStorage { try { return parent::test(); } catch (Exception $e) { + \OC::$server->getLogger()->logException($e); return false; } } |