diff options
| -rw-r--r-- | src/Monolog/Formatter/LogmaticFormatter.php | 9 | ||||
| -rw-r--r-- | src/Monolog/Handler/LogmaticHandler.php | 6 | ||||
| -rw-r--r-- | tests/Monolog/Handler/LogmaticHandlerTest.php | 4 |
3 files changed, 12 insertions, 7 deletions
diff --git a/src/Monolog/Formatter/LogmaticFormatter.php b/src/Monolog/Formatter/LogmaticFormatter.php index 0b999a2..8684da4 100644 --- a/src/Monolog/Formatter/LogmaticFormatter.php +++ b/src/Monolog/Formatter/LogmaticFormatter.php @@ -18,6 +18,9 @@ namespace Monolog\Formatter; */ class LogmaticFormatter extends JsonFormatter { + + const MARKERS = ["sourcecode", "php"]; + /** * @param string */ @@ -57,12 +60,14 @@ class LogmaticFormatter extends JsonFormatter public function format(array $record): string { if (!empty($this->hostname)) { - $record['hostname'] = $this->hostname; + $record["hostname"] = $this->hostname; } if (!empty($this->appname)) { - $record['appname'] = $this->appname; + $record["appname"] = $this->appname; } + $record["@marker"] = self::MARKERS; + return parent::format($record); } } diff --git a/src/Monolog/Handler/LogmaticHandler.php b/src/Monolog/Handler/LogmaticHandler.php index 70c4d6a..9747220 100644 --- a/src/Monolog/Handler/LogmaticHandler.php +++ b/src/Monolog/Handler/LogmaticHandler.php @@ -23,17 +23,17 @@ class LogmaticHandler extends SocketHandler /** * @var string */ - protected $logToken; + private $logToken; /** * @var string */ - protected $hostname; + private $hostname; /** * @var string */ - protected $appname; + private $appname; /** * @param string $token Log token supplied by Logmatic. diff --git a/tests/Monolog/Handler/LogmaticHandlerTest.php b/tests/Monolog/Handler/LogmaticHandlerTest.php index e55f612..bab74ac 100644 --- a/tests/Monolog/Handler/LogmaticHandlerTest.php +++ b/tests/Monolog/Handler/LogmaticHandlerTest.php @@ -37,7 +37,7 @@ class LogmaticHandlerTest extends TestCase fseek($this->res, 0); $content = fread($this->res, 1024); - $this->assertRegexp('/testToken {"message":"Critical write test","context":\[\],"level":500,"level_name":"CRITICAL","channel":"test","datetime":"(.*)","extra":\[\],"hostname":"testHostname","appname":"testAppname"}/', $content); + $this->assertRegexp('/testToken {"message":"Critical write test","context":\[\],"level":500,"level_name":"CRITICAL","channel":"test","datetime":"(.*)","extra":\[\],"hostname":"testHostname","appname":"testAppname","@marker":\["sourcecode","php"\]}/', $content); } public function testWriteBatchContent() @@ -53,7 +53,7 @@ class LogmaticHandlerTest extends TestCase fseek($this->res, 0); $content = fread($this->res, 1024); - $this->assertRegexp('/testToken {"message":"test","context":\[\],"level":300,"level_name":"WARNING","channel":"test","datetime":"(.*)","extra":\[\],"hostname":"testHostname","appname":"testAppname"}/', $content); + $this->assertRegexp('/testToken {"message":"test","context":\[\],"level":300,"level_name":"WARNING","channel":"test","datetime":"(.*)","extra":\[\],"hostname":"testHostname","appname":"testAppname","@marker":\["sourcecode","php"\]}/', $content); } private function createHandler() |