Merge pull request #7555 from nextcloud/smb-copy-rename-log

additional debug logging on smb copy/rename failures
nextcloud · Dec 18, 2017 · bdf4111 · bdf4111
2 parents 3da92a9 + 4f0d03e
commit bdf4111
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git 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\IRenameChange;
 use OCP\Files\Storage\INotifyStorage;
 use OCP\Files\StorageNotAvailableException;
+use OCP\Util;
 
 class SMB extends Common implements INotifyStorage {
 	/**
@@ -199,6 +200,7 @@ public function rename($source, $target) {
 			$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
@@ -229,6 +229,9 @@ public function copy($path1, $path2) {
 			$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;
 		}