1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-29 18:22:41 +01:00

Pass key to aggregate exception

Summary: This information may be quite useful.

Test Plan: Uploaded file.

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin

Differential Revision: https://secure.phabricator.com/D3763
This commit is contained in:
vrana 2012-10-20 07:08:26 -07:00
parent 67498f3334
commit b97cfed23a
2 changed files with 14 additions and 26 deletions

View file

@ -176,18 +176,18 @@ final class PhabricatorFile extends PhabricatorFileDAO {
// We stored the file somewhere so stop trying to write it to other // We stored the file somewhere so stop trying to write it to other
// places. // places.
break; break;
} catch (Exception $ex) {
if ($ex instanceof PhabricatorFileStorageConfigurationException) {
// If an engine is outright misconfigured (or misimplemented), raise
// that immediately since it probably needs attention.
throw $ex;
}
} catch (PhabricatorFileStorageConfigurationException $ex) {
// If an engine is outright misconfigured (or misimplemented), raise
// that immediately since it probably needs attention.
throw $ex;
} catch (Exception $ex) {
// If an engine doesn't work, keep trying all the other valid engines // If an engine doesn't work, keep trying all the other valid engines
// in case something else works. // in case something else works.
phlog($ex); phlog($ex);
$exceptions[] = $ex; $exceptions[$engine_class] = $ex;
} }
} }

View file

@ -70,26 +70,14 @@ widths on different languages:
$linters = array(); $linters = array();
$text_80col_linter = new ArcanistTextLinter(); // Warn on JS/CSS lines longer than 80 columns.
$linters[] = $text_80col_linter; $linters['TextLinter80Col'] = id(new ArcanistTextLinter())
->setPaths(preg_grep('/\.(js|css)$/', $paths));
$text_120col_linter = new ArcanistTextLinter(); // Warn on Java lines longer than 120 columns.
$text_120col_linter->setMaxLineLength(120); $linters['TextLinter120Col'] = id(new ArcanistTextLinter())
$linters[] = $text_120col_linter; ->setMaxLineLength(120)
->setPaths(preg_grep('/\.(java)$/', $paths));
foreach ($paths as $path) {
// Warn on JS/CSS lines longer than 80 columns.
if (preg_match('/\.(js|css)$/', $path)) {
$text_80col_linter->addPath($path);
}
// Warn on Java lines longer than 120 columns.
if (preg_match('/\.java$/', $path)) {
$text_120col_linter->addPath($path);
}
}
// ... // ...