From 88d1e20d561735ae4eccd6ebd40c1be70cbb8cf6 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Thu, 24 Oct 2013 14:24:56 +0200 Subject: some logging added .... --- lib/private/files/cache/scanner.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'lib/private/files/cache') diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php index f63abf2d4fc..bcf88da3670 100644 --- a/lib/private/files/cache/scanner.php +++ b/lib/private/files/cache/scanner.php @@ -62,8 +62,12 @@ class Scanner extends BasicEmitter { * @return array with metadata of the file */ public function getData($path) { + if (!$this->storage->isReadable($path)) { + //cant read, nothing we can do + \OCP\Util::writeLog('OC\Files\Cache\Scanner', "!!! Path '$path' is not readable !!!", \OCP\Util::ERROR); + return null; + } $data = array(); - if (!$this->storage->isReadable($path)) return null; //cant read, nothing we can do $data['mimetype'] = $this->storage->getMimeType($path); $data['mtime'] = $this->storage->filemtime($path); if ($data['mimetype'] == 'httpd/unix-directory') { @@ -104,7 +108,9 @@ class Scanner extends BasicEmitter { $newData = $data; $cacheData = $this->cache->get($file); if ($cacheData) { - $this->permissionsCache->remove($cacheData['fileid']); + if (isset($cacheData['fileid'])) { + $this->permissionsCache->remove($cacheData['fileid']); + } if ($reuseExisting) { // prevent empty etag $etag = $cacheData['etag']; @@ -137,6 +143,9 @@ class Scanner extends BasicEmitter { } // Only update metadata that has changed $newData = array_diff($data, $cacheData); + if (isset($newData['etag'])) { + \OCP\Util::writeLog('OC\Files\Cache\Scanner', "!!! No reuse of etag for '$file' !!!", \OCP\Util::ERROR); + } } } if (!empty($newData)) { -- cgit v1.2.3 From c5b8963b18f1dabf248d025789c04fe82d66e3f2 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Thu, 24 Oct 2013 18:13:21 +0200 Subject: log the data arrays --- lib/private/files/cache/scanner.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/private/files/cache') diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php index bcf88da3670..4868bb7a3fb 100644 --- a/lib/private/files/cache/scanner.php +++ b/lib/private/files/cache/scanner.php @@ -144,7 +144,9 @@ class Scanner extends BasicEmitter { // Only update metadata that has changed $newData = array_diff($data, $cacheData); if (isset($newData['etag'])) { - \OCP\Util::writeLog('OC\Files\Cache\Scanner', "!!! No reuse of etag for '$file' !!!", \OCP\Util::ERROR); + $cacheDataString = print_r($cacheData, true); + $dataString = print_r($data, true); + \OCP\Util::writeLog('OC\Files\Cache\Scanner', "!!! No reuse of etag for '$file' !!! \ncache: $cacheDataString \ndata: $dataString", \OCP\Util::ERROR); } } } -- cgit v1.2.3 From f619f59f1cffc594f466a94293b1424a6ac28ade Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Fri, 25 Oct 2013 12:39:50 +0200 Subject: cast storage_mtime to int --- lib/private/files/cache/cache.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/private/files/cache') diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php index fc2d965d7f9..824f54de21f 100644 --- a/lib/private/files/cache/cache.php +++ b/lib/private/files/cache/cache.php @@ -140,6 +140,7 @@ class Cache { $data['fileid'] = (int)$data['fileid']; $data['size'] = (int)$data['size']; $data['mtime'] = (int)$data['mtime']; + $data['storage_mtime'] = (int)$data['storage_mtime']; $data['encrypted'] = (bool)$data['encrypted']; $data['unencrypted_size'] = (int)$data['unencrypted_size']; $data['storage'] = $this->storageId; -- cgit v1.2.3 From 8253994262ef6a8965551a0e1e58b89fce33db1d Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Fri, 25 Oct 2013 12:40:31 +0200 Subject: using array_diff_assoc to detect diffs in values as well --- lib/private/files/cache/scanner.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/private/files/cache') diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php index 4868bb7a3fb..3fd92c97e6b 100644 --- a/lib/private/files/cache/scanner.php +++ b/lib/private/files/cache/scanner.php @@ -142,7 +142,7 @@ class Scanner extends BasicEmitter { } } // Only update metadata that has changed - $newData = array_diff($data, $cacheData); + $newData = array_diff_assoc($data, $cacheData); if (isset($newData['etag'])) { $cacheDataString = print_r($cacheData, true); $dataString = print_r($data, true); -- cgit v1.2.3 From 0f266d0f62315c4362f936ff6d0fb146c438ce65 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Mon, 4 Nov 2013 12:58:30 +0100 Subject: set log level to DEBUG --- lib/private/files/cache/scanner.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib/private/files/cache') diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php index 3fd92c97e6b..17f99d675ae 100644 --- a/lib/private/files/cache/scanner.php +++ b/lib/private/files/cache/scanner.php @@ -64,7 +64,7 @@ class Scanner extends BasicEmitter { public function getData($path) { if (!$this->storage->isReadable($path)) { //cant read, nothing we can do - \OCP\Util::writeLog('OC\Files\Cache\Scanner', "!!! Path '$path' is not readable !!!", \OCP\Util::ERROR); + \OCP\Util::writeLog('OC\Files\Cache\Scanner', "!!! Path '$path' is not readable !!!", \OCP\Util::DEBUG); return null; } $data = array(); @@ -146,7 +146,9 @@ class Scanner extends BasicEmitter { if (isset($newData['etag'])) { $cacheDataString = print_r($cacheData, true); $dataString = print_r($data, true); - \OCP\Util::writeLog('OC\Files\Cache\Scanner', "!!! No reuse of etag for '$file' !!! \ncache: $cacheDataString \ndata: $dataString", \OCP\Util::ERROR); + \OCP\Util::writeLog('OC\Files\Cache\Scanner', + "!!! No reuse of etag for '$file' !!! \ncache: $cacheDataString \ndata: $dataString", + \OCP\Util::DEBUG); } } } -- cgit v1.2.3