diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php index e5734a6b3..0d7543a37 100644 --- a/airtime_mvc/application/controllers/PreferenceController.php +++ b/airtime_mvc/application/controllers/PreferenceController.php @@ -509,11 +509,11 @@ class PreferenceController extends Zend_Controller_Action $files = CcFilesQuery::create()->find(); foreach ($files as $file) { $storedFile = new Application_Model_StoredFile($file, null); - $storedFile->delete(); + // Delete the files quietly to avoid getting Sentry errors for + // every S3 file we delete. + $storedFile->delete(true); } - /* TODO: delete hard copies of files? */ - $this->getResponse() ->setHttpResponseCode(200) ->appendBody("OK"); diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index 51baf2e20..32d6ec371 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -375,7 +375,7 @@ SQL; * Deletes the physical file from the local file system or from the cloud * */ - public function delete() + public function delete($quiet=false) { // Check if the file is scheduled to be played in the future if (Application_Model_Schedule::IsFileScheduledInTheFuture($this->_file->getCcFileId())) { @@ -401,13 +401,16 @@ SQL; //or from the cloud if ($this->_file->getDbImportStatus() == CcFiles::IMPORT_STATUS_SUCCESS) { try { - Logging::info("DELETING PHYSICAL FILE " . $this->_file->getDbTrackTitle()); $this->_file->deletePhysicalFile(); } catch (Exception $e) { - //Just log the exception and continue. - Logging::error($e); + if ($quiet) { + Logging::info($e); + } else { + //Just log the exception and continue. + Logging::error($e); + } } }