mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-10-23 09:36:11 +02:00
Code Issues Releases Wiki Activity

Merge branch '1.x'

Browse Source
This commit is contained in:
Jordi Boggiano
2018-11-04 17:18:09 +01:00
parent 1e23ca4e51 dd144f7fa2
commit 6ab058099c
12 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Monolog/Handler/LogEntriesHandler.php
View File

@@ -31,13 +31,13 @@ class LogEntriesHandler extends SocketHandler
*
* @throws MissingExtensionException If SSL encryption is set to true and OpenSSL is missing
*/
public function __construct($token, $useSSL = true, $level = Logger::DEBUG, bool $bubble = true)
public function __construct($token, $useSSL = true, $level = Logger::DEBUG, bool $bubble = true, string $host = 'data.logentries.com')
{
if ($useSSL && !extension_loaded('openssl')) {
throw new MissingExtensionException('The OpenSSL PHP plugin is required to use SSL encrypted connection for LogEntriesHandler');
}
$endpoint = $useSSL ? 'ssl://data.logentries.com:443' : 'data.logentries.com:80';
$endpoint = $useSSL ? 'ssl://' . $host . ':443' : $host . ':80';
parent::__construct($endpoint, $level, $bubble);
$this->logToken = $token;
}

8
src/Monolog/Handler/RavenHandler.php
View File

@@ -27,7 +27,7 @@ class RavenHandler extends AbstractProcessingHandler
/**
* Translates Monolog log levels to Raven log levels.
*/
private $logLevels = [
protected $logLevels = [
Logger::DEBUG => Raven_Client::DEBUG,
Logger::INFO => Raven_Client::INFO,
Logger::NOTICE => Raven_Client::INFO,
@@ -41,13 +41,13 @@ class RavenHandler extends AbstractProcessingHandler
/**
* @var string the current application environment (staging|preprod|prod)
*/
private $environment;
protected $environment;
/**
* @var string should represent the current version of the calling
* software. Can be any string (git commit, version number)
*/
private $release;
protected $release;
/**
* @var Raven_Client the client object that sends the message to the server
@@ -226,7 +226,7 @@ class RavenHandler extends AbstractProcessingHandler
*/
protected function getExtraParameters(): array
{
return ['checksum', 'release', 'environment', 'event_id'];
return ['contexts', 'checksum', 'release', 'environment', 'event_id'];
}
/**