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

Rename Elastica handler for naming consistency

Browse Source
This commit is contained in:
Avtandil Kikabidze
2018-04-07 02:53:11 +04:00
parent f5696399f8
commit 57f3ca1791
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Monolog/Handler/ElasticSearchHandler.php → src/Monolog/Handler/ElasticaHandler.php
View File

@@ -27,13 +27,13 @@ use Elastica\Exception\ExceptionInterface;
* 'index' => 'elastic_index_name', * 'index' => 'elastic_index_name',
* 'type' => 'elastic_doc_type', * 'type' => 'elastic_doc_type',
* ); * );
* $handler = new ElasticSearchHandler($client, $options); * $handler = new ElasticaHandler($client, $options);
* $log = new Logger('application'); * $log = new Logger('application');
* $log->pushHandler($handler); * $log->pushHandler($handler);
* *
* @author Jelle Vink <jelle.vink@gmail.com> * @author Jelle Vink <jelle.vink@gmail.com>
*/ */
class ElasticSearchHandler extends AbstractProcessingHandler class ElasticaHandler extends AbstractProcessingHandler
{ {
/** /**
* @var Client * @var Client
@@ -81,7 +81,7 @@ class ElasticSearchHandler extends AbstractProcessingHandler
if ($formatter instanceof ElasticaFormatter) { if ($formatter instanceof ElasticaFormatter) {
return parent::setFormatter($formatter); return parent::setFormatter($formatter);
} }
throw new \InvalidArgumentException('ElasticSearchHandler is only compatible with ElasticaFormatter'); throw new \InvalidArgumentException('ElasticaHandler is only compatible with ElasticaFormatter');
} }
/** /**

42
tests/Monolog/Handler/ElasticSearchHandlerTest.php → tests/Monolog/Handler/ElasticaHandlerTest.php
View File

@@ -19,7 +19,7 @@ use Elastica\Client;
use Elastica\Request; use Elastica\Request;
use Elastica\Response; use Elastica\Response;
class ElasticSearchHandlerTest extends TestCase class ElasticaHandlerTest extends TestCase
{ {
/** /**
* @var Client mock * @var Client mock
@@ -49,10 +49,10 @@ class ElasticSearchHandlerTest extends TestCase
} }
/** /**
* @covers Monolog\Handler\ElasticSearchHandler::write * @covers Monolog\Handler\ElasticaHandler::write
* @covers Monolog\Handler\ElasticSearchHandler::handleBatch * @covers Monolog\Handler\ElasticaHandler::handleBatch
* @covers Monolog\Handler\ElasticSearchHandler::bulkSend * @covers Monolog\Handler\ElasticaHandler::bulkSend
* @covers Monolog\Handler\ElasticSearchHandler::getDefaultFormatter * @covers Monolog\Handler\ElasticaHandler::getDefaultFormatter
*/ */
public function testHandle() public function testHandle()
{ {
@@ -77,17 +77,17 @@ class ElasticSearchHandlerTest extends TestCase
->with($expected); ->with($expected);
// perform tests // perform tests
$handler = new ElasticSearchHandler($this->client, $this->options); $handler = new ElasticaHandler($this->client, $this->options);
$handler->handle($msg); $handler->handle($msg);
$handler->handleBatch([$msg]); $handler->handleBatch([$msg]);
} }
/** /**
* @covers Monolog\Handler\ElasticSearchHandler::setFormatter * @covers Monolog\Handler\ElasticaHandler::setFormatter
*/ */
public function testSetFormatter() public function testSetFormatter()
{ {
$handler = new ElasticSearchHandler($this->client); $handler = new ElasticaHandler($this->client);
$formatter = new ElasticaFormatter('index_new', 'type_new'); $formatter = new ElasticaFormatter('index_new', 'type_new');
$handler->setFormatter($formatter); $handler->setFormatter($formatter);
$this->assertInstanceOf('Monolog\Formatter\ElasticaFormatter', $handler->getFormatter()); $this->assertInstanceOf('Monolog\Formatter\ElasticaFormatter', $handler->getFormatter());
@@ -96,20 +96,20 @@ class ElasticSearchHandlerTest extends TestCase
} }
/** /**
* @covers Monolog\Handler\ElasticSearchHandler::setFormatter * @covers Monolog\Handler\ElasticaHandler::setFormatter
* @expectedException InvalidArgumentException * @expectedException InvalidArgumentException
* @expectedExceptionMessage ElasticSearchHandler is only compatible with ElasticaFormatter * @expectedExceptionMessage ElasticaHandler is only compatible with ElasticaFormatter
*/ */
public function testSetFormatterInvalid() public function testSetFormatterInvalid()
{ {
$handler = new ElasticSearchHandler($this->client); $handler = new ElasticaHandler($this->client);
$formatter = new NormalizerFormatter(); $formatter = new NormalizerFormatter();
$handler->setFormatter($formatter); $handler->setFormatter($formatter);
} }
/** /**
* @covers Monolog\Handler\ElasticSearchHandler::__construct * @covers Monolog\Handler\ElasticaHandler::__construct
* @covers Monolog\Handler\ElasticSearchHandler::getOptions * @covers Monolog\Handler\ElasticaHandler::getOptions
*/ */
public function testOptions() public function testOptions()
{ {
@@ -118,12 +118,12 @@ class ElasticSearchHandlerTest extends TestCase
'type' => $this->options['type'], 'type' => $this->options['type'],
'ignore_error' => false, 'ignore_error' => false,
]; ];
$handler = new ElasticSearchHandler($this->client, $this->options); $handler = new ElasticaHandler($this->client, $this->options);
$this->assertEquals($expected, $handler->getOptions()); $this->assertEquals($expected, $handler->getOptions());
} }
/** /**
* @covers Monolog\Handler\ElasticSearchHandler::bulkSend * @covers Monolog\Handler\ElasticaHandler::bulkSend
* @dataProvider providerTestConnectionErrors * @dataProvider providerTestConnectionErrors
*/ */
public function testConnectionErrors($ignore, $expectedError) public function testConnectionErrors($ignore, $expectedError)
@@ -131,7 +131,7 @@ class ElasticSearchHandlerTest extends TestCase
$clientOpts = ['host' => '127.0.0.1', 'port' => 1]; $clientOpts = ['host' => '127.0.0.1', 'port' => 1];
$client = new Client($clientOpts); $client = new Client($clientOpts);
$handlerOpts = ['ignore_error' => $ignore]; $handlerOpts = ['ignore_error' => $ignore];
$handler = new ElasticSearchHandler($client, $handlerOpts); $handler = new ElasticaHandler($client, $handlerOpts);
if ($expectedError) { if ($expectedError) {
$this->expectException($expectedError[0]); $this->expectException($expectedError[0]);
@@ -156,10 +156,10 @@ class ElasticSearchHandlerTest extends TestCase
/** /**
* Integration test using localhost Elastic Search server * Integration test using localhost Elastic Search server
* *
* @covers Monolog\Handler\ElasticSearchHandler::__construct * @covers Monolog\Handler\ElasticaHandler::__construct
* @covers Monolog\Handler\ElasticSearchHandler::handleBatch * @covers Monolog\Handler\ElasticaHandler::handleBatch
* @covers Monolog\Handler\ElasticSearchHandler::bulkSend * @covers Monolog\Handler\ElasticaHandler::bulkSend
* @covers Monolog\Handler\ElasticSearchHandler::getDefaultFormatter * @covers Monolog\Handler\ElasticaHandler::getDefaultFormatter
*/ */
public function testHandleIntegration() public function testHandleIntegration()
{ {
@@ -182,7 +182,7 @@ class ElasticSearchHandlerTest extends TestCase
]; ];
$client = new Client(); $client = new Client();
$handler = new ElasticSearchHandler($client, $this->options); $handler = new ElasticaHandler($client, $this->options);
try { try {
$handler->handleBatch([$msg]); $handler->handleBatch([$msg]);
} catch (\RuntimeException $e) { } catch (\RuntimeException $e) {