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

Add support for AWS SDK v3

Browse Source
This commit is contained in:
Jordi Boggiano
2016-09-29 09:17:17 +02:00
parent 40b4891030
commit d72b886978
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -22,7 +22,7 @@
"sentry/sentry": "^0.13", "sentry/sentry": "^0.13",
"ruflin/elastica": ">=0.90 <3.0", "ruflin/elastica": ">=0.90 <3.0",
"doctrine/couchdb": "~1.0@dev", "doctrine/couchdb": "~1.0@dev",
"aws/aws-sdk-php": "^2.4.9", "aws/aws-sdk-php": "^2.4.9 || ^3.0",
"php-amqplib/php-amqplib": "~2.4", "php-amqplib/php-amqplib": "~2.4",
"swiftmailer/swiftmailer": "~5.3", "swiftmailer/swiftmailer": "~5.3",
"php-console/php-console": "^3.1.3", "php-console/php-console": "^3.1.3",

22
src/Monolog/Handler/DynamoDbHandler.php
View File

@@ -13,6 +13,7 @@ namespace Monolog\Handler;
use Aws\Common\Aws; use Aws\Common\Aws;
use Aws\DynamoDb\DynamoDbClient; use Aws\DynamoDb\DynamoDbClient;
use Aws\DynamoDb\Marshaler;
use Monolog\Formatter\ScalarFormatter; use Monolog\Formatter\ScalarFormatter;
use Monolog\Logger; use Monolog\Logger;
@@ -36,6 +37,16 @@ class DynamoDbHandler extends AbstractProcessingHandler
*/ */
protected $table; protected $table;
/**
* @var int
*/
protected $version;
/**
* @var Marshaler
*/
protected $marshaler;
/** /**
* @param DynamoDbClient $client * @param DynamoDbClient $client
* @param string $table * @param string $table
@@ -44,8 +55,11 @@ class DynamoDbHandler extends AbstractProcessingHandler
*/ */
public function __construct(DynamoDbClient $client, $table, $level = Logger::DEBUG, $bubble = true) public function __construct(DynamoDbClient $client, $table, $level = Logger::DEBUG, $bubble = true)
{ {
if (!defined('Aws\Common\Aws::VERSION') || version_compare('3.0', Aws::VERSION, '<=')) { if (defined('Aws\Common\Aws::VERSION') && version_compare(Aws::VERSION, '3.0', '>=')) {
throw new \RuntimeException('The DynamoDbHandler is only known to work with the AWS SDK 2.x releases'); $this->version = 3;
$this->marshaler = new Marshaler;
} else {
$this->version = 2;
} }
$this->client = $client; $this->client = $client;
@@ -60,7 +74,11 @@ class DynamoDbHandler extends AbstractProcessingHandler
protected function write(array $record) protected function write(array $record)
{ {
$filtered = $this->filterEmptyFields($record['formatted']); $filtered = $this->filterEmptyFields($record['formatted']);
if ($this->version === 3) {
$formatted = $this->marshaler->marshalItem($filtered);
} else {
$formatted = $this->client->formatAttributes($filtered); $formatted = $this->client->formatAttributes($filtered);
}
$this->client->putItem(array( $this->client->putItem(array(
'TableName' => $this->table, 'TableName' => $this->table,