diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2014-09-09 23:32:32 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2014-09-09 23:32:32 +0200 |
| commit | c3d90b96c8ec4bcf96e28c6ccdb194494888cc61 (patch) | |
| tree | 8b394cd232420042ea85ac8fde6f6ba878942f84 /apps | |
| parent | cd94b54be3676a2be772ef76c39ad706ff3eb947 (diff) | |
| parent | fa718d2e2cccb8e48b89044166a80b82b91288fa (diff) | |
| download | nextcloud-server-c3d90b96c8ec4bcf96e28c6ccdb194494888cc61.tar.gz nextcloud-server-c3d90b96c8ec4bcf96e28c6ccdb194494888cc61.zip | |
Merge pull request #10922 from owncloud/explicit-scan-transactions
Use bigger transactions when doing explicit file system scans
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/ajax/scan.php | 2 | ||||
| -rw-r--r-- | apps/files/command/scan.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/ajax/scan.php b/apps/files/ajax/scan.php index da5a2ce6f26..f8977c2971e 100644 --- a/apps/files/ajax/scan.php +++ b/apps/files/ajax/scan.php @@ -20,7 +20,7 @@ $listener = new ScanListener($eventSource); foreach ($users as $user) { $eventSource->send('user', $user); - $scanner = new \OC\Files\Utils\Scanner($user); + $scanner = new \OC\Files\Utils\Scanner($user, \OC::$server->getDatabaseConnection()); $scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', array($listener, 'file')); $scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', array($listener, 'folder')); if ($force) { diff --git a/apps/files/command/scan.php b/apps/files/command/scan.php index 3412cf80dea..e4d719a8b4b 100644 --- a/apps/files/command/scan.php +++ b/apps/files/command/scan.php @@ -46,7 +46,7 @@ class Scan extends Command { } protected function scanFiles($user, OutputInterface $output) { - $scanner = new \OC\Files\Utils\Scanner($user); + $scanner = new \OC\Files\Utils\Scanner($user, \OC::$server->getDatabaseConnection()); $scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function ($path) use ($output) { $output->writeln("Scanning <info>$path</info>"); }); |