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

Merge pull request #11311 from owncloud/fixing-unhandled-exception-cleanTmp-master 

catch and log exception in OC_Helper::cleanTmp()
This commit is contained in:
Lukas Reschke 2014-09-26 14:31:31 +02:00
parent e5a111b80e 4c08215e66
commit 53f6d74938
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/private/helper.php
View File

@ -644,15 +644,33 @@ class OC_Helper {
if (file_exists($leftoversFile)) {
$leftovers = file($leftoversFile);
foreach ($leftovers as $file) {
self::rmdirr($file);
try {
self::rmdirr($file);
} catch (UnexpectedValueException $ex) {
// not really much we can do here anymore
if (!is_null(\OC::$server)) {
$message = $ex->getMessage();
\OC::$server->getLogger()->error("Error deleting file/folder: $file - Reason: $message",
array('app' => 'core'));
}
}
}
unlink($leftoversFile);
}
foreach (self::$tmpFiles as $file) {
if (file_exists($file)) {
if (!self::rmdirr($file)) {
file_put_contents($leftoversFile, $file . "\n", FILE_APPEND);
try {
if (!self::rmdirr($file)) {
file_put_contents($leftoversFile, $file . "\n", FILE_APPEND);
}
} catch (UnexpectedValueException $ex) {
// not really much we can do here anymore
if (!is_null(\OC::$server)) {
$message = $ex->getMessage();
\OC::$server->getLogger()->error("Error deleting file/folder: $file - Reason: $message",
array('app' => 'core'));
}
}
}
}