merge configurations

Idea taken from theorchard/monolog-cascade#51
TeamPull · Jul 29, 2016 · 3131698 · 3131698
1 parent 000346c
commit 3131698
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/source/MonologFactory.php b/source/MonologFactory.php
@@ -35,14 +35,20 @@ function __construct($vars){
 
     protected $loggerRegistry = [];
     protected function loadMonologConfig($vars)
-    {       
+    {
+        $path = $vars['monolog_config_dir'] . '/monolog.dist.yaml';
+        $dist = [];
+        if(file_exists($path)){
+            $dist = Yaml::parse(file_get_contents($path))          
+        }
         $path = $vars['monolog_config_dir'] . '/monolog.yaml';
-        if(!file_exists($path)){
-            $path = $vars['monolog_config_dir'] . '/monolog.dist.yaml';
+        $custom = [];
+        if(file_exists($path)){
+            $custom = Yaml::parse(file_get_contents($path));
         }
-        //Do not try catch parse erors because the system should
-        // not continue to work until the configuration is fixed
-        return Yaml::parse(file_get_contents($path));
+
+        $res = array_merge($dist,$custom);
+        return $res;
     }
 
     private function isList(array $arr)