diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-09-26 09:17:47 +0200 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2014-10-01 15:57:30 +0200 |
| commit | 7d389b26f94c130fc6bd8958edb80e07048e89b2 (patch) | |
| tree | 7f018050100a977ad8e38e0371788c9df8afa506 /lib | |
| parent | 3fb55d9d2ee087923722e40e89763ac104fb004e (diff) | |
| download | nextcloud-server-7d389b26f94c130fc6bd8958edb80e07048e89b2.tar.gz nextcloud-server-7d389b26f94c130fc6bd8958edb80e07048e89b2.zip | |
catch and log exception in OC_Helper::cleanTmp()
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/helper.php | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/lib/private/helper.php b/lib/private/helper.php index 8764a6b35d9..33233225e73 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -643,15 +643,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')); + } } } } |