mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1159 from nextcloud/stable9.1-27a5be96f108d4ab2b91bcd765433e1646ba9bf2 

[9.1] Before a user is getting scanned the database connection is re-…
This commit is contained in:
Lukas Reschke 2016-08-29 21:39:55 +02:00 committed by GitHub
parent 0a1b1d57a7 db420e54a1
commit dbc860e6f7
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
apps/files/lib/Command/Scan.php
View File

@ -28,9 +28,11 @@
namespace OCA\Files\Command; namespace OCA\Files\Command;
use Doctrine\DBAL\Connection;
use OC\Core\Command\Base; use OC\Core\Command\Base;
use OC\ForbiddenException; use OC\ForbiddenException;
use OCP\Files\StorageNotAvailableException; use OCP\Files\StorageNotAvailableException;
use OCP\IDBConnection;
use OCP\IUserManager; use OCP\IUserManager;
use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
@ -106,7 +108,8 @@ class Scan extends Base {
} }
protected function scanFiles($user, $path, $verbose, OutputInterface $output, $backgroundScan = false) { protected function scanFiles($user, $path, $verbose, OutputInterface $output, $backgroundScan = false) {
$scanner = new \OC\Files\Utils\Scanner($user, \OC::$server->getDatabaseConnection(), \OC::$server->getLogger()); $connection = $this->reconnectToDatabase($output);
$scanner = new \OC\Files\Utils\Scanner($user, $connection, \OC::$server->getLogger());
# check on each file/folder if there was a user interrupt (ctrl-c) and throw an exception # check on each file/folder if there was a user interrupt (ctrl-c) and throw an exception
# printout and count # printout and count
if ($verbose) { if ($verbose) {
@ -318,4 +321,26 @@ class Scan extends Base {
return date('H:i:s', $secs); return date('H:i:s', $secs);
} }
/**
* @return \OCP\IDBConnection
*/
protected function reconnectToDatabase(OutputInterface $output) {
/** @var Connection | IDBConnection $connection*/
$connection = \OC::$server->getDatabaseConnection();
try {
$connection->close();
} catch (\Exception $ex) {
$output->writeln("<info>Error while disconnecting from database: {$ex->getMessage()}</info>");
}
while (!$connection->isConnected()) {
try {
$connection->connect();
} catch (\Exception $ex) {
$output->writeln("<info>Error while re-connecting to database: {$ex->getMessage()}</info>");
sleep(60);
}
}
return $connection;
}
} }