lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Another attempt

Browse Source
This commit is contained in:
Graham Campbell
2016-05-25 11:28:03 +01:00
parent 72577a04b7
commit 13d0ff320a
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/Foundation/Providers/ConfigServiceProvider.php
View File

@@ -38,21 +38,19 @@ class ConfigServiceProvider extends ServiceProvider
$cache = $this->app->make(Cache::class);
$loaded = $cache->load($env);
$this->app->terminating(function () use ($env, $repo, $cache, $loaded) {
if ($repo->stale() || $loaded === false) {
$cache->store($env, $repo->all());
$this->app->terminating(function () use ($repo, $cache) {
if ($repo->stale()) {
$cache->clear();
}
});
try {
// Get the default settings.
$defaultSettings = $this->app->config->get('setting');
if ($loaded === false) {
$loaded = $repo->all();
$cache->store($env, $loaded);
}
// Get the configured settings.
$appSettings = $loaded === false ? $repo->all() : $loaded;
// Merge the settings
$settings = array_merge($defaultSettings, $appSettings);
$settings = array_merge($this->app->config->get('setting'), $loaded);
$this->app->config->set('setting', $settings);
} catch (Exception $e) {