mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-08 06:06:40 +02:00
Code Issues Releases Wiki Activity

CubeHandler cleanup

Browse Source
This commit is contained in:
Jordi Boggiano
2012-08-18 18:51:10 +02:00
parent bd73a56c67
commit 7c2ca1c61c
3 changed files with 50 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -2,5 +2,4 @@ vendor
composer.phar composer.phar
phpunit.xml phpunit.xml
composer.lock composer.lock
.DS_Store .DS_Store

1
README.mdown
View File

@@ -113,6 +113,7 @@ Handlers
for UNIX and TCP sockets. See an [example](https://github.com/Seldaek/monolog/blob/master/doc/sockets.md). for UNIX and TCP sockets. See an [example](https://github.com/Seldaek/monolog/blob/master/doc/sockets.md).
- _AmqpHandler_: Logs records to an [amqp](http://www.amqp.org/) compatible - _AmqpHandler_: Logs records to an [amqp](http://www.amqp.org/) compatible
server. Requires the [php-amqp](http://pecl.php.net/package/amqp) extension (1.0+). server. Requires the [php-amqp](http://pecl.php.net/package/amqp) extension (1.0+).
- _CubeHandler_: Logs records to a [Cube](http://square.github.com/cube/) server.
Wrappers / Special Handlers Wrappers / Special Handlers
--------------------------- ---------------------------

85
src/Monolog/Handler/CubeHandler.php
View File

@@ -15,20 +15,18 @@ use Monolog\Logger;
/** /**
* Logs to Cube. * Logs to Cube.
* @link http://square.github.com/cube/
* *
* @link http://square.github.com/cube/
* @author Wan Chen <kami@kamisama.me> * @author Wan Chen <kami@kamisama.me>
*/ */
class CubeHandler extends AbstractProcessingHandler class CubeHandler extends AbstractProcessingHandler
{ {
private $udpConnection = null; private $udpConnection = null;
private $httpConnection = null; private $httpConnection = null;
private $scheme = null; private $scheme = null;
private $host = null; private $host = null;
private $port = null; private $port = null;
private $acceptedScheme = array('http', 'udp'); private $acceptedSchemes = array('http', 'udp');
/** /**
* Create a Cube handler * Create a Cube handler
@@ -41,36 +39,23 @@ class CubeHandler extends AbstractProcessingHandler
{ {
$urlInfos = parse_url($url); $urlInfos = parse_url($url);
if (!$urlInfos || !isset($urlInfos['scheme']) if (!isset($urlInfos['scheme']) || !isset($urlInfos['host']) || !isset($urlInfos['port'])) {
|| !isset($urlInfos['host']) || !isset($urlInfos['port'])) {
throw new \UnexpectedValueException('URL "'.$url.'" is not valid'); throw new \UnexpectedValueException('URL "'.$url.'" is not valid');
} }
if (!in_array($urlInfos['scheme'], $this->acceptedScheme)) { if (!in_array($urlInfos['scheme'], $this->acceptedSchemes)) {
throw new \UnexpectedValueException( throw new \UnexpectedValueException(
'Invalid ' . $urlInfos['scheme'] . ' protocol.' 'Invalid protocol (' . $urlInfos['scheme'] . ').'
. 'Valid options are ' . implode(', ', $this->acceptedScheme)); . ' Valid options are ' . implode(', ', $this->acceptedSchemes));
} else { }
$this->scheme = $urlInfos['scheme']; $this->scheme = $urlInfos['scheme'];
$this->host = $urlInfos['host']; $this->host = $urlInfos['host'];
$this->port = $urlInfos['port']; $this->port = $urlInfos['port'];
}
parent::__construct($level, $bubble); parent::__construct($level, $bubble);
} }
/**
* Check if a connection resource is available
*
* @return boolean
*/
private function isConnected($scheme)
{
return $this->{$scheme . 'Connection'} !== null;
}
/** /**
* Establish a connection to an UDP socket * Establish a connection to an UDP socket
* *
@@ -79,7 +64,7 @@ class CubeHandler extends AbstractProcessingHandler
protected function connectUdp() protected function connectUdp()
{ {
if (!extension_loaded('sockets')) { if (!extension_loaded('sockets')) {
throw new \LogicException('The sockets extension is not loaded'); throw new \LogicException('The sockets extension is needed to use udp URLs with the CubeHandler');
} }
$this->udpConnection = socket_create(AF_INET, SOCK_DGRAM, 0); $this->udpConnection = socket_create(AF_INET, SOCK_DGRAM, 0);
@@ -88,31 +73,29 @@ class CubeHandler extends AbstractProcessingHandler
} }
if (!socket_connect($this->udpConnection, $this->host, $this->port)) { if (!socket_connect($this->udpConnection, $this->host, $this->port)) {
throw new \LogicException('Unable to connect to the socket at ' throw new \LogicException('Unable to connect to the socket at ' . $this->host . ':' . $this->port);
. $this->host . ':' . $this->port);
} }
} }
/** /**
* Establish a connection to a http server * Establish a connection to a http server
*/ */
protected function connectHttp() protected function connectHttp()
{ {
$this->httpConnection = if (!extension_loaded('curl')) {
curl_init('http://'.$this->host.':'.$this->port.'/1.0/event/put'); throw new \LogicException('The curl extension is needed to use http URLs with the CubeHandler');
}
$this->httpConnection = curl_init('http://'.$this->host.':'.$this->port.'/1.0/event/put');
if (!$this->httpConnection) { if (!$this->httpConnection) {
throw new \LogicException('Unable to connect to ' throw new \LogicException('Unable to connect to ' . $this->host . ':' . $this->port);
. $this->host . ':' . $this->port);
} }
curl_setopt($this->httpConnection, CURLOPT_CUSTOMREQUEST, "POST"); curl_setopt($this->httpConnection, CURLOPT_CUSTOMREQUEST, "POST");
curl_setopt($this->httpConnection, CURLOPT_RETURNTRANSFER, true); curl_setopt($this->httpConnection, CURLOPT_RETURNTRANSFER, true);
} }
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
@@ -120,47 +103,43 @@ class CubeHandler extends AbstractProcessingHandler
{ {
$date = $record['datetime']; $date = $record['datetime'];
$datas = array('time' => $date->format('Y-m-d H:i:s')); $data = array('time' => $date->format('Y-m-d H:i:s'));
unset($record['datetime']); unset($record['datetime']);
if (isset($record['context']['type'])) { if (isset($record['context']['type'])) {
$datas['type'] = $record['context']['type']; $data['type'] = $record['context']['type'];
unset($record['context']['type']); unset($record['context']['type']);
} else { } else {
$datas['type'] = $record['channel']; $data['type'] = $record['channel'];
} }
$datas['data'] = $record['context']; $data['data'] = $record['context'];
$datas['data']['level'] = $record['level']; $data['data']['level'] = $record['level'];
call_user_func( $this->{'write'.$this->scheme}(json_encode($data));
array($this, 'send'.ucwords($this->scheme)), json_encode($datas));
} }
private function writeUdp($data)
private function sendUdp($datas)
{ {
if (!$this->isConnected($this->scheme)) { if (!$this->udpConnection) {
call_user_func( $this->connectUdp();
array($this, 'connect' . ucwords($this->scheme)));
} }
socket_send($this->udpConnection, $datas, strlen($datas), 0); socket_send($this->udpConnection, $data, strlen($data), 0);
} }
private function writeHttp($data)
private function sendHttp($datas)
{ {
if (!$this->isConnected($this->scheme)) { if (!$this->httpConnection) {
call_user_func( $this->connectHttp();
array($this, 'connect' . ucwords($this->scheme)));
} }
curl_setopt($this->httpConnection, CURLOPT_POSTFIELDS, '['.$datas.']'); curl_setopt($this->httpConnection, CURLOPT_POSTFIELDS, '['.$data.']');
curl_setopt($this->httpConnection, CURLOPT_HTTPHEADER, array( curl_setopt($this->httpConnection, CURLOPT_HTTPHEADER, array(
'Content-Type: application/json', 'Content-Type: application/json',
'Content-Length: ' . strlen('['.$datas.']')) 'Content-Length: ' . strlen('['.$data.']'))
); );
return curl_exec($this->httpConnection); return curl_exec($this->httpConnection);
} }
} }