diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-09-26 09:17:47 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-09-26 11:36:53 +0200 |
| commit | 4c08215e665e30249af51e688de9d0b3bbb68909 (patch) | |
| tree | e5c606d2a5d9ff902f82099c7c8e94140915e530 | |
| parent | 16319379905b2a8d52d182f7361864135408d622 (diff) | |
| download | nextcloud-server-4c08215e665e30249af51e688de9d0b3bbb68909.tar.gz nextcloud-server-4c08215e665e30249af51e688de9d0b3bbb68909.zip | |
catch and log exception in OC_Helper::cleanTmp()
| -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 1297d356d09..ea91cc57516 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -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')); + } } } } |