Merge pull request #2 from kirsenn/master

Don't crash application if newrelic ext is missing
bazilio91 · Dec 24, 2015 · 4d34147 · 4d34147
2 parents d35d140 + 171773b
commit 4d34147
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/Newrelic.php b/Newrelic.php
@@ -70,10 +70,15 @@ public function init()
     {
         parent::init();
 
-        if ($this->enabled && Agent::isLoaded()) {
-            $this->name = $this->name ? $this->name : \Yii::$app->name;
-            $this->agent = new Agent();
-            $this->agent->setAppname($this->name, $this->licence);
+        if ($this->enabled) {
+            if (Agent::isLoaded()) {
+                $this->name = $this->name ? $this->name : \Yii::$app->name;
+                $this->agent = new Agent();
+                $this->agent->setAppname($this->name, $this->licence);
+            } else {
+                $this->enabled = false;
+                \Yii::$app->getLog()->getLogger()->log('Newrelic extension is not loaded', \yii\log\Logger::LEVEL_ERROR);
+            }
         }
     }
 }