Merge branch 'release/1.1.0'

Author: Steve Thomas

.gitignore

@@ -0,0 +1,2 @@
+vendor
+composer.lock

application/config/monolog.php

@@ -12,9 +12,9 @@
 
 
 /* GENERAL OPTIONS */
-$config['handler'] = 'file'; // valid handlers are file
+$config['handlers'] = array('file', 'new_relic'); // valid handlers are file | new_relic
 $config['channel'] = ENVIRONMENT; // channel name which appears on each line of log
-$config['threshold'] = '1'; // 'ERROR' => '1', 'DEBUG' => '2',  'INFO' => '3', 'ALL' => '4'
+$config['threshold'] = '4'; // 'ERROR' => '1', 'DEBUG' => '2',  'INFO' => '3', 'ALL' => '4'
 $config['introspection_processor'] = TRUE; // add some meta data such as controller and line number to log messages
 
 /* FILE HANDLER OPTIONS
@@ -23,5 +23,8 @@
 */
 $config['file_logfile'] = APPPATH . 'logs/ci.log';
 
+/* NEW RELIC OPTIONS */
+$config['new_relic_app_name'] = 'App Name';
+
 // exclusion list for pesky messages which you may wish to temporarily suppress with strpos() match
 $config['exclusion_list'] = array();

application/libraries/Log.php

@@ -5,7 +5,7 @@
 /*
  * CodeIgniter Monolog integration
  *
- * Version 1.0.1
+ * Version 1.1.0
  * (c) Steve Thomas <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
@@ -15,6 +15,7 @@
 use Monolog\Logger;
 use Monolog\ErrorHandler;
 use Monolog\Handler\RotatingFileHandler;
+use Monolog\Handler\NewRelicHandler;
 use Monolog\Processor\IntrospectionProcessor;
 
 /**
@@ -67,16 +68,23 @@ public function __construct()
             $this->log->pushProcessor(new IntrospectionProcessor());
         }
 
-        // decide which handler to use
-        switch ($this->config['handler']) {
-            case 'file':
-                $handler = new RotatingFileHandler($this->config['file_logfile']);
-                break;
-            default:
-                exit('log handler not supported: ' . $this->config['handler']);
-        }
+        // decide which handler(s) to use
+        foreach ($this->config['handlers'] as $value) {
+            switch ($value) {
+                case 'file':
+                    $handler = new RotatingFileHandler($this->config['file_logfile']);
+                    break;
+
+                case 'new_relic':
+                    $handler = new NewRelicHandler(Logger::ERROR, true, $this->config['new_relic_app_name']);
+                    break;
 
-        $this->log->pushHandler($handler);
+                default:
+                    exit('log handler not supported: ' . $this->config['handler']);
+            }
+
+            $this->log->pushHandler($handler);
+        }
 
         $this->write_log('DEBUG', 'Monolog replacement logger initialized');
     }
@@ -89,8 +97,10 @@ public function __construct()
      * @param $msg
      * @return bool
      */
-    public function write_log($level = 'error', $msg)
-    {
+    public function write_log(
+        $level = 'error',
+        $msg
+    ) {
         $level = strtoupper($level);
 
         // verify error level
@@ -106,7 +116,7 @@ public function write_log($level = 'error', $msg)
 
                 if ($pos !== false) {
                     // just exit now - we don't want to log this error
-                    return TRUE;
+                    return true;
                 }
             }
         }
@@ -125,6 +135,6 @@ public function write_log($level = 'error', $msg)
                     break;
             }
         }
-        return TRUE;
+        return true;
     }
 }

composer.json

@@ -1,5 +1,5 @@
 {
     "require": {
-        "monolog/monolog": "1.6.*"
+        "monolog/monolog": "1.7.*"
     }
 }