diff options
| author | Robin Appelman <robin@icewind.nl> | 2017-12-18 15:02:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-18 15:02:18 +0100 |
| commit | bdf411101351033596d391341c2cca28dcecfecf (patch) | |
| tree | ae1a89a3d539a98609afa39354e076561d2a524d | |
| parent | 3da92a9a781a4f16ef9cf14aebb47a6f44945fd8 (diff) | |
| parent | 4f0d03e1722fbc09944f24364501d1264653e6cb (diff) | |
| download | nextcloud-server-bdf411101351033596d391341c2cca28dcecfecf.tar.gz nextcloud-server-bdf411101351033596d391341c2cca28dcecfecf.zip | |
Merge pull request #7555 from nextcloud/smb-copy-rename-log
additional debug logging on smb copy/rename failures
| -rw-r--r-- | apps/files_external/lib/Lib/Storage/SMB.php | 2 | ||||
| -rw-r--r-- | lib/private/Files/Storage/Common.php | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/apps/files_external/lib/Lib/Storage/SMB.php b/apps/files_external/lib/Lib/Storage/SMB.php index 557dafda72c..67ba2ae2c54 100644 --- a/apps/files_external/lib/Lib/Storage/SMB.php +++ b/apps/files_external/lib/Lib/Storage/SMB.php @@ -52,6 +52,7 @@ use OCP\Files\Notify\IChange; use OCP\Files\Notify\IRenameChange; use OCP\Files\Storage\INotifyStorage; use OCP\Files\StorageNotAvailableException; +use OCP\Util; class SMB extends Common implements INotifyStorage { /** @@ -199,6 +200,7 @@ class SMB extends Common implements INotifyStorage { $this->remove($target); $result = $this->share->rename($absoluteSource, $absoluteTarget); } catch (\Exception $e) { + \OC::$server->getLogger()->logException($e, ['level' => Util::WARN]); return false; } unset($this->statCache[$absoluteSource], $this->statCache[$absoluteTarget]); diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php index 715b7b18499..56d683ffa25 100644 --- a/lib/private/Files/Storage/Common.php +++ b/lib/private/Files/Storage/Common.php @@ -229,6 +229,9 @@ abstract class Common implements Storage, ILockingStorage { $source = $this->fopen($path1, 'r'); $target = $this->fopen($path2, 'w'); list(, $result) = \OC_Helper::streamCopy($source, $target); + if (!$result) { + \OC::$server->getLogger()->warning("Failed to write data while copying $path1 to $path2"); + } $this->removeCachedFile($path2); return $result; } |