From 0fdcc450e8751633ebe4a72a518a1d894c08b54a Mon Sep 17 00:00:00 2001 From: micha Date: Tue, 16 Jan 2018 13:34:44 +0100 Subject: [PATCH 1/6] set LE_ADDRESS --- src/LogEntries.php | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/LogEntries.php b/src/LogEntries.php index 0af017f..2423812 100644 --- a/src/LogEntries.php +++ b/src/LogEntries.php @@ -9,9 +9,9 @@ class LogEntries extends AbstractLogger { /** LogEntries server address for receiving logs */ - const LE_ADDRESS = 'tcp://api.logentries.com'; + const LE_ADDRESS = 'tcp://'; /** LogEntries server address for receiving logs via TLS */ - const LE_TLS_ADDRESS = 'tls://api.logentries.com'; + const LE_TLS_ADDRESS = 'tls://'; /** LogEntries server port for receiving logs by token */ const LE_PORT = 10000; /** LogEntries server port for receiving logs with TLS by token */ @@ -25,6 +25,12 @@ class LogEntries extends AbstractLogger * @var \SplStack * @link http://php.net/manual/class.splstack.php */ + + /** + * @var string + */ + private $le_address; + private $_writer_stack; /** @var resource */ private $_socketResource; @@ -217,12 +223,12 @@ public function isDataHub() public function getAddress() { if ($this->isTLS() && !$this->isDataHub()) { - return self::LE_TLS_ADDRESS; + return self::LE_TLS_ADDRESS.$this->le_address; } if ($this->isDataHub()) { return $this->_dataHubIPAddress; } - return self::LE_ADDRESS; + return self::LE_ADDRESS.$this->le_address; } /** @@ -498,4 +504,11 @@ public function debug($message, array $context = array()) return $this->log(LogLevel::DEBUG, $message, $context); } + /** + * @param \SplStack $le_address + */ + public function setLeAddress($le_address) { + $this->le_address = $le_address; + } + } \ No newline at end of file From 1450d0be993326b748bde55973b57c4b82283535 Mon Sep 17 00:00:00 2001 From: micha Date: Wed, 17 Jan 2018 15:28:12 +0100 Subject: [PATCH 2/6] fix phpdoc --- src/LogEntries.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LogEntries.php b/src/LogEntries.php index 2423812..2b558ed 100644 --- a/src/LogEntries.php +++ b/src/LogEntries.php @@ -505,7 +505,7 @@ public function debug($message, array $context = array()) } /** - * @param \SplStack $le_address + * @param string $le_address */ public function setLeAddress($le_address) { $this->le_address = $le_address; From 092d040a36bb12e19879baa35f1d03deb8de2fed Mon Sep 17 00:00:00 2001 From: Michael Bladowski Date: Sun, 20 May 2018 14:04:03 +0200 Subject: [PATCH 3/6] fix ssl conenction --- src/LogEntries.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/LogEntries.php b/src/LogEntries.php index 2b558ed..a31d9b4 100644 --- a/src/LogEntries.php +++ b/src/LogEntries.php @@ -11,11 +11,11 @@ class LogEntries extends AbstractLogger /** LogEntries server address for receiving logs */ const LE_ADDRESS = 'tcp://'; /** LogEntries server address for receiving logs via TLS */ - const LE_TLS_ADDRESS = 'tls://'; + const LE_TLS_ADDRESS = 'ssl://'; /** LogEntries server port for receiving logs by token */ const LE_PORT = 10000; /** LogEntries server port for receiving logs with TLS by token */ - const LE_TLS_PORT = 20000; + const LE_TLS_PORT = 443; /** @var LogEntries */ private static $_instance; @@ -511,4 +511,4 @@ public function setLeAddress($le_address) { $this->le_address = $le_address; } -} \ No newline at end of file +} From c1a2bc312758a2164cbf7c17cd8ba754eb7c8e22 Mon Sep 17 00:00:00 2001 From: Michael Bladowski Date: Fri, 18 Jan 2019 18:56:30 +0100 Subject: [PATCH 4/6] =?UTF-8?q?don=C2=B4t=20log=20anything=20if=20there=20?= =?UTF-8?q?is=20no=20connection?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/LogEntries.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/LogEntries.php b/src/LogEntries.php index a31d9b4..6b666b1 100644 --- a/src/LogEntries.php +++ b/src/LogEntries.php @@ -348,7 +348,9 @@ private function isJSON($string) */ public function log($level, $message, array $context = array()) { - $this->connectIfNotConnected(); + if ($this->connectIfNotConnected()===false) { + return null; + } if (is_array($message)) { $message = json_encode($message); From 847424aaa4e6d62ce63962a7d8a5b3b99a74a1c9 Mon Sep 17 00:00:00 2001 From: Michael Bladowski Date: Thu, 24 Jan 2019 19:58:07 +0100 Subject: [PATCH 5/6] add setter for the token --- src/LogEntries.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/LogEntries.php b/src/LogEntries.php index 6b666b1..4a18146 100644 --- a/src/LogEntries.php +++ b/src/LogEntries.php @@ -512,5 +512,12 @@ public function debug($message, array $context = array()) public function setLeAddress($le_address) { $this->le_address = $le_address; } + + /** + * @param string $token + */ + public function setToken($token) { + $this->_token = $token; + } } From c62b2503c426f3012e85b2a3b602142f368b261f Mon Sep 17 00:00:00 2001 From: Michael Bladowski Date: Tue, 19 May 2020 18:52:08 +0200 Subject: [PATCH 6/6] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index da9e333..76dcb2d 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "cbschuld/logentries", + "name": "michabbb/logentries", "version": "1.0.4", "description": "A PHP PSR-3 compliant logging class for LogEntries service (https://logentries.com/)", "keywords": [