diff --git a/src/Monolog/Formatter/FluentdFormatter.php b/src/Monolog/Formatter/FluentdFormatter.php
new file mode 100644
index 00000000..00c28dc5
--- /dev/null
+++ b/src/Monolog/Formatter/FluentdFormatter.php
@@ -0,0 +1,82 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Formatter;
+
+/**
+ * Class FluentdFormatter
+ *
+ * Serializes a log message to Fluetd unix socket protocol
+ *
+ * Fluentd config:
+ *
+ *
+ * type unix
+ * path /var/run/td-agent/td-agent.sock
+ *
+ *
+ * Monolog setup:
+ *
+ * $logger = new Monolog\Logger('fluent.tag');
+ * $fluentHandler = new Monolog\Handler\SocketHandler('unix:///var/run/td-agent/td-agent.sock');
+ * $fluentHandler->setFormatter(new Monolog\Formatter\FluentdFormatter());
+ * $logger->pushHandler($fluentHandler);
+ *
+ * @author Andrius Putna
+ */
+
+class FluentdFormatter implements FormatterInterface
+{
+ protected $levelTag = false;
+
+ public function __construct($levelTag = false)
+ {
+ if (!function_exists('json_encode')) {
+ throw new \RuntimeException('PHP\'s json extension is required to use Monolog\'s FluentdUnixFormatter');
+ }
+
+ $this->levelTag = (bool)$levelTag;
+ }
+
+ public function isUsingLevelsInTag()
+ {
+ return $this->levelTag;
+ }
+
+ public function format(array $record)
+ {
+ $tag = $record['channel'];
+ if ($this->levelTag) {
+ $tag .= '.' . strtolower($record['level_name']);
+ }
+
+ return '['
+ . '"' . $tag . '"'
+ . ', '
+ . $record['datetime']->getTimestamp()
+ . ', '
+ . json_encode([
+ 'message' => $record['message'],
+ 'level' => $record['level'],
+ 'level_name' => $record['level_name'],
+ 'extra' => $record['extra']])
+ . ']';
+ }
+
+ public function formatBatch(array $records)
+ {
+ $message = '';
+ foreach ($records as $record) {
+ $message .= $this->format($record);
+ }
+ return $message;
+ }
+}
diff --git a/tests/Monolog/Formatter/FluentdFormatterTest.php b/tests/Monolog/Formatter/FluentdFormatterTest.php
new file mode 100644
index 00000000..5bba8d64
--- /dev/null
+++ b/tests/Monolog/Formatter/FluentdFormatterTest.php
@@ -0,0 +1,52 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Formatter;
+
+use Monolog\Logger;
+use Monolog\TestCase;
+
+class FluentdFormatterTest extends TestCase
+{
+ /**
+ * @covers Monolog\Formatter\FluentdFormatter::__construct
+ * @covers Monolog\Formatter\FluentdFormatter::isUsingLevelsInTag
+ */
+ public function testConstruct()
+ {
+ $formatter = new FluentdFormatter();
+ $this->assertEquals(false, $formatter->isUsingLevelsInTag());
+ $formatter = new FluentdFormatter(false);
+ $this->assertEquals(false, $formatter->isUsingLevelsInTag());
+ $formatter = new FluentdFormatter(true);
+ $this->assertEquals(true, $formatter->isUsingLevelsInTag());
+ }
+
+ /**
+ * @covers Monolog\Formatter\FluentdFormatter::format
+ */
+ public function testFormat()
+ {
+
+ $record = $this->getRecord(Logger::WARNING);
+ $record['datetime'] = new \DateTime("@0");
+
+ $formatter = new FluentdFormatter();
+ $this->assertEquals(
+ '["test", 0, {"message":"test","level":300,"level_name":"WARNING","extra":[]}]',
+ $formatter->format($record));
+
+ $formatter = new FluentdFormatter(true);
+ $this->assertEquals(
+ '["test.warning", 0, {"message":"test","level":300,"level_name":"WARNING","extra":[]}]',
+ $formatter->format($record));
+ }
+}