cy-katsuhiro-miura / fuelphp-with-fluentd

classes/log/file.php

Spacing +16 added lines, -16 removed lines

@@ -8,9 +8,9 @@ 
 	public static function write($level, $msg, $method = null)
 	{
 		$log_threshold = \Config::get('log_threshold');
-		$config = \Config::get('log',array());
+		$config = \Config::get('log', array());
 
-		if( isset($config['drivers']['file']['log_threshold']))
+		if (isset($config['drivers']['file']['log_threshold']))
 		{
 			$log_threshold = $config['drivers']['file']['log_threshold'];
 		}
@@ -59,40 +59,40 @@ 
 		if ( ! empty($method))
 		{
 			$call .= $method;
-		}else{
+		}else {
 			$backtrace = debug_backtrace();
-			$i=0;
-			for(;$i<count($backtrace);$i++){
+			$i = 0;
+			for (;$i < count($backtrace); $i++) {
 				$backtrace[$i]['object'] = null;
 				$break = false;
 
-				if(isset($backtrace[$i]['class'])){
-					if(!strstr($backtrace[$i]['class'],__NAMESPACE__)
-						and !strstr($backtrace[$i]['class'],'Fuel\Core\Log')) {
+				if (isset($backtrace[$i]['class'])) {
+					if ( ! strstr($backtrace[$i]['class'], __NAMESPACE__)
+						and ! strstr($backtrace[$i]['class'], 'Fuel\Core\Log')) {
 	
 						//
-						if($level === 'Error'){
+						if ($level === 'Error') {
 							if ($level == 'Error') var_dump($backtrace);
 						}
 						$break = true;
 					}
 				}
 
-				if($break){
+				if ($break) {
 					break;
 				}
 			}
-			if(isset($backtrace[$i])){
-				$call .= isset($backtrace[$i]['class'])    ? $backtrace[$i]['class']      : ' - ';
-				$call .= isset($backtrace[$i]['type'])     ? $backtrace[$i]['type']       : ' - ';
-				$call .= isset($backtrace[$i]['function']) ? $backtrace[$i]['function']   : ' - ';
-				$call .= isset($backtrace[$i-1]['line'])   ? ':'.$backtrace[$i-1]['line'] : ' - ';
+			if (isset($backtrace[$i])) {
+				$call .= isset($backtrace[$i]['class']) ? $backtrace[$i]['class'] : ' - ';
+				$call .= isset($backtrace[$i]['type']) ? $backtrace[$i]['type'] : ' - ';
+				$call .= isset($backtrace[$i]['function']) ? $backtrace[$i]['function'] : ' - ';
+				$call .= isset($backtrace[$i-1]['line']) ? ':'.$backtrace[$i-1]['line'] : ' - ';
 			}
 		}
 
 		$message .= $level.' '.(($level == 'info') ? ' -' : '-').' ';
 		$message .= date(\Config::get('log_date_format'));
-		$message .= ' - ' . 'ouid=' . parent::$opensocial_user_id;
+		$message .= ' - '.'ouid='.parent::$opensocial_user_id;
 		$message .= ' --> '.(empty($call) ? '' : $call.' - ').$msg.PHP_EOL;
 
 		flock($fp, LOCK_EX);

Braces +4 added lines, -2 removed lines

@@ -59,7 +59,7 @@ 
 		if ( ! empty($method))
 		{
 			$call .= $method;
-		}else{
+		} else{
 			$backtrace = debug_backtrace();
 			$i=0;
 			for(;$i<count($backtrace);$i++){
@@ -72,7 +72,9 @@ 
 	
 						//
 						if($level === 'Error'){
-							if ($level == 'Error') var_dump($backtrace);
+							if ($level == 'Error') {
+								var_dump($backtrace);
+							}
 						}
 						$break = true;
 					}

classes/log/td.php

Spacing +24 added lines, -24 removed lines

@@ -4,9 +4,9 @@ 
 
 namespace Fluentd\Log;
 
-class Td extends \Fuel\Core\Log{
+class Td extends \Fuel\Core\Log {
 
-	public static function _init(){
+	public static function _init() {
 
 		\Fluent\Autoloader::register();
 		
@@ -16,9 +16,9 @@ 
 	public static function write($level, $msg, $method = null)
 	{
 		$log_threshold = \Config::get('log_threshold');
-		$config = \Config::get('log',array());
+		$config = \Config::get('log', array());
 
-		if( isset($config['drivers']['td']['log_threshold']))
+		if (isset($config['drivers']['td']['log_threshold']))
 		{
 			$log_threshold = $config['drivers']['td']['log_threshold'];
 		}
@@ -39,58 +39,58 @@ 
 			\Console::log($method.' - '.$msg);
 		}
 
-		$host     = empty($config['drivers']['td']['host'])     ? null      : $config['drivers']['td']['host'];
-		$port     = empty($config['drivers']['td']['port'])     ? null      : $config['drivers']['td']['port'];
-		$options  = empty($config['drivers']['td']['options'])  ? array()   : $config['drivers']['td']['options'];
-		$packer   = empty($config['drivers']['td']['packer'])   ? null      : $config['drivers']['td']['packer'];
+		$host     = empty($config['drivers']['td']['host']) ? null : $config['drivers']['td']['host'];
+		$port     = empty($config['drivers']['td']['port']) ? null : $config['drivers']['td']['port'];
+		$options  = empty($config['drivers']['td']['options']) ? array() : $config['drivers']['td']['options'];
+		$packer   = empty($config['drivers']['td']['packer']) ? null : $config['drivers']['td']['packer'];
 		$database = empty($config['drivers']['td']['database']) ? 'default' : $config['drivers']['td']['database'];
 
-		$logger = new \Fluent\Logger\FluentLogger($host,$port,$options,$packer);
+		$logger = new \Fluent\Logger\FluentLogger($host, $port, $options, $packer);
 
-		$message  = array();
+		$message = array();
 
 		$call = array();
 		if ( ! empty($method))
 		{
 			//$call .= $method;
 			$call['method'] = $method;
-		}else{
+		}else {
 			$backtrace = debug_backtrace();
-			$i=0;
-			for(;$i<count($backtrace);$i++){
+			$i = 0;
+			for (;$i < count($backtrace); $i++) {
 				$backtrace[$i]['object'] = null;
 				$break = false;
 
-				if(isset($backtrace[$i]['class'])){
-					if(!strstr($backtrace[$i]['class'],__NAMESPACE__)
-						and !strstr($backtrace[$i]['class'],'Fuel\Core\Log')) {
+				if (isset($backtrace[$i]['class'])) {
+					if ( ! strstr($backtrace[$i]['class'], __NAMESPACE__)
+						and ! strstr($backtrace[$i]['class'], 'Fuel\Core\Log')) {
 	
 						//
-						if($level === 'Error'){
+						if ($level === 'Error') {
 							//if ($level == 'Error') var_dump($backtrace);
 						}
 						$break = true;
 					}
 				}
 
-				if($break){
+				if ($break) {
 					break;
 				}
 			}
-			if(isset($backtrace[$i])){
-				$call['class']    = isset($backtrace[$i]['class'])    ? $backtrace[$i]['class']    : 'null';
-				$call['type']     = isset($backtrace[$i]['type'])     ? $backtrace[$i]['type']     : 'null';
+			if (isset($backtrace[$i])) {
+				$call['class']    = isset($backtrace[$i]['class']) ? $backtrace[$i]['class'] : 'null';
+				$call['type']     = isset($backtrace[$i]['type']) ? $backtrace[$i]['type'] : 'null';
 				$call['function'] = isset($backtrace[$i]['function']) ? $backtrace[$i]['function'] : 'null';
-				$call['line']     = isset($backtrace[$i-1]['line'])   ? $backtrace[$i-1]['line']   : 'null';
+				$call['line']     = isset($backtrace[$i-1]['line']) ? $backtrace[$i-1]['line'] : 'null';
 			}
 		}
 
 		$message['level'] = $level;
 		$message['date']  = date(\Config::get('log_date_format'));
 		$message['msg']   = $msg;
-	   	$message['call']  = $call;
+	   	$message['call'] = $call;
 
-		$res = $logger->post('td.'.$database.'.fuel_log',$message);
+		$res = $logger->post('td.'.$database.'.fuel_log', $message);
 
 		return true;
 	}

Braces +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 		{
 			//$call .= $method;
 			$call['method'] = $method;
-		}else{
+		} else{
 			$backtrace = debug_backtrace();
 			$i=0;
 			for(;$i<count($backtrace);$i++){

classes/log/copy.php

Spacing +7 added lines, -7 removed lines

@@ -2,18 +2,18 @@
 
 namespace Fluentd\Log;
 
-class Copy extends \Fluentd\Log{
+class Copy extends \Fluentd\Log {
 
-	public static function write($level, $msg, $method = null){
+	public static function write($level, $msg, $method = null) {
 		$log_config = \Config::get('log');
 
 		$return = false;
-		if(array_key_exists('copy',$log_config['drivers'])){
-			foreach( $log_config['drivers']['copy'] as $driver){
-				$class = __NAMESPACE__ .'\\'. ucfirst($driver);
+		if (array_key_exists('copy', $log_config['drivers'])) {
+			foreach ($log_config['drivers']['copy'] as $driver) {
+				$class = __NAMESPACE__.'\\'.ucfirst($driver);
 
-				try{
-					$return = $class::write($level,$msg,$method);
+				try {
+					$return = $class::write($level, $msg, $method);
 				} catch (FuelException $e) {
 					//
 				}

classes/log.php

Spacing +5 added lines, -5 removed lines

@@ -10,7 +10,7 @@ 
 		self::$opensocial_user_id = $opensocial_user_id;
 	}
 
-	public static function _init(){
+	public static function _init() {
 		\Config::load('log', true);
 	}
 
@@ -19,10 +19,10 @@ 
 		return static::write(\Fuel::L_INFO, $msg, $method);
 	}
 
-	public static function write($level, $msg, $method = null){
+	public static function write($level, $msg, $method = null) {
 
 		\Config::load('log', true);
-		$config = \Config::get('log',array());
+		$config = \Config::get('log', array());
 		
 		if (empty($config['driver']))
 		{
@@ -31,8 +31,8 @@ 
 
 		$class = 'Fluentd\\Log\\'.ucfirst($config['driver']);
 		
-		try{
-			return $class::write($level,$msg,$method);
+		try {
+			return $class::write($level, $msg, $method);
 		} catch (FuelException $e) {
 		}
 	}

classes/observer/td.php

Spacing +7 added lines, -7 removed lines

@@ -17,20 +17,20 @@
 	{
 
 		$save_data = array();
-		foreach(array_keys($obj->properties()) as $p){
+		foreach (array_keys($obj->properties()) as $p) {
 			$save_data[$p] = $obj->{$p};
 		}
 
-		$host     = empty(self::$td_config['host'])     ? null      : self::$td_config['host'];
-		$port     = empty(self::$td_config['port'])     ? null      : self::$td_config['port'];
-		$options  = empty(self::$td_config['options'])  ? array()   : self::$td_config['options'];
-		$packer   = empty(self::$td_config['packer'])   ? null      : self::$td_config['packer'];
+		$host     = empty(self::$td_config['host']) ? null : self::$td_config['host'];
+		$port     = empty(self::$td_config['port']) ? null : self::$td_config['port'];
+		$options  = empty(self::$td_config['options']) ? array() : self::$td_config['options'];
+		$packer   = empty(self::$td_config['packer']) ? null : self::$td_config['packer'];
 		$database = empty(self::$td_config['database']) ? 'default' : self::$td_config['database'];
 		$table_name = $obj->table();
 
 		\Fluent\Autoloader::register();
-		$logger = new \Fluent\Logger\FluentLogger($host,$port,$options,$packer);
-		$res = $logger->post('td.'.$database.'.'.$table_name,$save_data);
+		$logger = new \Fluent\Logger\FluentLogger($host, $port, $options, $packer);
+		$res = $logger->post('td.'.$database.'.'.$table_name, $save_data);
 
 	}
 }

config/observer.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php 
-$observer_conf =  array(
+$observer_conf = array(
 	'td' => array(
 		'database' => 'default',
 		//'host' => 'unix:///var/run/td-agent/td-agent.sock',

config/log.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php 
-$log_conf =  array(
+$log_conf = array(
 	'driver' => 'file',
 
 	'drivers' => array(
@@ -7,7 +7,7 @@ 
 				'log_threshold'    => Fuel::L_INFO,
 				'log_path' => DOCROOT.'../logs/',
 				),
-		'copy' => array('file','td'),
+		'copy' => array('file', 'td'),
 		'td' => array(
 			'log_threshold'    => Fuel::L_INFO,
 			'database' => 'default',