Slightly more robust configuration polling.

This commit is contained in:
James Cole
2020-07-06 06:49:48 +02:00
parent 4271dc1638
commit 26d19fab32
4 changed files with 32 additions and 25 deletions

View File

@@ -24,6 +24,7 @@ namespace FireflyIII\Support;
use Cache;
use Exception;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Configuration;
use Illuminate\Database\QueryException;
use Log;
@@ -67,9 +68,10 @@ class FireflyConfig
/**
* @param string $name
* @param mixed $default
* @param null $default
*
* @return \FireflyIII\Models\Configuration|null
* @throws FireflyException
* @return Configuration|null
*/
public function get(string $name, $default = null): ?Configuration
{
@@ -82,10 +84,12 @@ class FireflyConfig
}
try {
/** @var Configuration $config */
$config = Configuration::where('name', $name)->first(['id', 'name', 'data']);
} catch (QueryException|Exception $e) {
Log::error(sprintf('Query exception while polling for config var: %s', $e->getMessage()));
return null;
Log::error($e->getTraceAsString());
throw new FireflyException(sprintf('Could not poll the database: %s', $e->getMessage()));
}
if ($config) {