summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-03-19 10:10:04 +0100
committerGitHub <noreply@github.com>2018-03-19 10:10:04 +0100
commit63bc633d89e53c2ff04d3fd521a2a1b18f6737f7 (patch)
treeb28ff0756e3e91e94973a454a16fe8293c5f0c4d /apps
parent2fab6b2620ba8411777f6b2380a11468f813825e (diff)
parent41954d29034cef1a6c9bf2f488d6517f32566678 (diff)
downloadnextcloud-server-63bc633d89e53c2ff04d3fd521a2a1b18f6737f7.tar.gz
nextcloud-server-63bc633d89e53c2ff04d3fd521a2a1b18f6737f7.zip
Merge pull request #8857 from nextcloud/swift-verify-cached-token
verify cached swift token
Diffstat (limited to 'apps')
-rw-r--r--apps/files_external/lib/Lib/Storage/Swift.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/apps/files_external/lib/Lib/Storage/Swift.php b/apps/files_external/lib/Lib/Storage/Swift.php
index a638169dcb2..f72aa076d27 100644
--- a/apps/files_external/lib/Lib/Storage/Swift.php
+++ b/apps/files_external/lib/Lib/Storage/Swift.php
@@ -194,7 +194,11 @@ class Swift extends \OC\Files\Storage\Common {
$this->params = $params;
// FIXME: private class...
$this->objectCache = new \OC\Cache\CappedMemoryCache();
- $this->connectionFactory = new SwiftFactory(\OC::$server->getMemCacheFactory()->createDistributed('swift/'), $this->params);
+ $this->connectionFactory = new SwiftFactory(
+ \OC::$server->getMemCacheFactory()->createDistributed('swift/'),
+ $this->params,
+ \OC::$server->getLogger()
+ );
$this->objectStore = new \OC\Files\ObjectStore\Swift($this->params, $this->connectionFactory);
$this->bucket = $params['bucket'];
}