improved building configuration

hiqdev · Sep 27, 2017 · 43aeed3 · 43aeed3
1 parent d3382b7
commit 43aeed3
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 15 deletions.
diff --git a/src/config/common.php b/src/config/common.php
@@ -25,12 +25,12 @@
                 ],
             ],
         ],
-        'sentry' => array_filter([
-            'class' => \mito\sentry\Component::class,
-            'enabled' => $params['sentry.enabled'],
-            'dsn' => $params['sentry.dsn'],
-            'environment' => $env,
-        ]),
+        'sentry' => [
+            'class'         => \mito\sentry\Component::class,
+            'enabled'       => $params['sentry.enabled'],
+            'dsn'           => $params['sentry.dsn'],
+            'environment'   => $params['sentry.environment'],
+        ],
     ]),
     'modules' => [
         'monitoring' => [

diff --git a/src/config/params.php b/src/config/params.php
@@ -8,15 +8,26 @@
  * @copyright Copyright (c) 2017, HiQDev (http://hiqdev.com/)
  */
 
-return [
-    'adminEmail' => null,
+$env = defined('YII_ENV') ? YII_ENV : 'prod';
 
-    'monitoring.flag' => \hiqdev\yii2\monitoring\Module::FLAG_APPLICATION,
-    'monitoring.feedback.subject' => 'Error feedback',
-    'monitoring.email.subject' => null,
-    'monitoring.email.from' => null,
-    'monitoring.email.to' => null,
+$defaults = [
+    'adminEmail'                    => null,
 
-    'sentry.dsn'        => null,
-    'sentry.enabled'    => null,
+    'monitoring.flag'               => \hiqdev\yii2\monitoring\Module::FLAG_APPLICATION,
+    'monitoring.feedback.subject'   => 'Error feedback',
+    'monitoring.email.subject'      => null,
+    'monitoring.email.from'         => null,
+    'monitoring.email.to'           => null,
+
+    'sentry.dsn'                    => null,
+    'sentry.enabled'                => $env === 'prod',
+    'sentry.environment'            => $env,
 ];
+
+$params = [];
+foreach ($defaults as $key => $default) {
+    $envKey = strtoupper(strtr($key, '.', '_'));
+    $params[$key] = isset($_ENV[$envKey]) ? $_ENV[$envKey] : $default;
+}
+
+return $params;