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

Merge branch '1.x'

Browse Source
This commit is contained in:
Jordi Boggiano
2016-03-13 16:20:29 +00:00
parent 96c20d9ba2 a9ccae25cb
commit f29dffeb16
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Monolog/Formatter/ElasticaFormatter.php
View File

@@ -36,7 +36,9 @@ class ElasticaFormatter extends NormalizerFormatter
*/
public function __construct($index, $type)
{
parent::__construct(\DateTime::ISO8601);
// elasticsearch requires a ISO 8601 format date with optional millisecond precision.
parent::__construct('Y-m-d\TH:i:s.uP');
$this->index = $index;
$this->type = $type;
}

2
tests/Monolog/Formatter/ElasticaFormatterTest.php
View File

@@ -42,7 +42,7 @@ class ElasticaFormatterTest extends \PHPUnit_Framework_TestCase
// expected values
$expected = $msg;
$expected['datetime'] = '1970-01-01T00:00:00+0000';
$expected['datetime'] = '1970-01-01T00:00:00.000000+00:00';
$expected['context'] = array(
'class' => '[object] (stdClass: {})',
'foo' => 7,