Author: ihabunek
Date: Thu Mar 29 14:56:47 2012
New Revision: 1306888

URL: http://svn.apache.org/viewvc?rev=1306888&view=rev
Log:
LOG4PHP-174: Made activation simpler.

Modified:
    logging/log4php/trunk/src/main/php/appenders/LoggerAppenderFirephp.php

Modified: logging/log4php/trunk/src/main/php/appenders/LoggerAppenderFirephp.php
URL: 
http://svn.apache.org/viewvc/logging/log4php/trunk/src/main/php/appenders/LoggerAppenderFirephp.php?rev=1306888&r1=1306887&r2=1306888&view=diff
==============================================================================
--- logging/log4php/trunk/src/main/php/appenders/LoggerAppenderFirephp.php 
(original)
+++ logging/log4php/trunk/src/main/php/appenders/LoggerAppenderFirephp.php Thu 
Mar 29 14:56:47 2012
@@ -64,12 +64,12 @@ class LoggerAppenderFirephp extends Logg
        protected $target = 'page';
 
        public function activateOptions() {
-               $this->console = $this->getConsole();
-               if (null === $this->console) {
-                       $this->warn('FirePHP is not installed correctly.');
+               if (method_exists('FirePHP', 'to')) {
+                       $this->console = FirePHP::to($this->target)->console();
+                       $this->closed = false;
+               } else {
+                       $this->warn('FirePHP is not installed correctly. 
Closing appender.');
                }
-                               
-               $this->closed = false;
        }
 
        public function append(LoggerLoggingEvent $event) {
@@ -97,24 +97,6 @@ class LoggerAppenderFirephp extends Logg
                return strtolower($event->getLevel()->toString());
        }
 
-       /**
-        * Returns the FirePHP Insight console.
-        * @return Insight_Plugin_Console
-        */
-       private function getConsole() {
-               if (isset($this->console)) {
-                       return $this->console;
-               }
-               
-               if (method_exists('FirePHP', 'to')) {
-                       $inspector = FirePHP::to($this->target);
-                       
-                       return $inspector->console();
-               }
-               
-               return null;
-       }
-
        /** Returns the target. */
        public function getTarget() {
                return $this->target;


Reply via email to