From 6077ef0f477baf9c477e4d3749f12516a2526adc Mon Sep 17 00:00:00 2001 From: Olof Johansson Date: Wed, 23 Dec 2015 09:53:42 +0100 Subject: [PATCH 1/6] Make the port number configurable. - Removed the predefined constants. - Removed property for DataHub port. - Removed datahubPort argument from constructor. - Added port argument to constructor. - Return port property when calling getPort(). --- LeLogger.php | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/LeLogger.php b/LeLogger.php index bfc3adf..6079a7f 100644 --- a/LeLogger.php +++ b/LeLogger.php @@ -35,10 +35,6 @@ class LeLogger const LE_ADDRESS = 'tcp://api.logentries.com'; // Logentries server address for receiving logs via TLS const LE_TLS_ADDRESS = 'tls://api.logentries.com'; - // 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; private $resource = null; @@ -46,7 +42,8 @@ class LeLogger private $_datahubIPAddress = ""; private $use_datahub = false; - private $_datahubPort = 10000; + + private $port = false; private $use_host_name = false; private $_host_name = ""; @@ -69,11 +66,11 @@ class LeLogger private $errstr; - public static function getLogger($token, $persistent, $ssl, $severity, $datahubEnabled, $datahubIPAddress, $datahubPort, $host_id, $host_name, $host_name_enabled, $add_local_timestamp) + public static function getLogger($token, $persistent, $ssl, $severity, $datahubEnabled, $datahubIPAddress, $port, $host_id, $host_name, $host_name_enabled, $add_local_timestamp) { if ( ! isset(self::$m_instance[$token])) { - self::$m_instance[$token] = new LeLogger($token, $persistent, $ssl, $severity, $datahubEnabled, $datahubIPAddress, $datahubPort, $host_id, $host_name, $host_name_enabled, $add_local_timestamp); + self::$m_instance[$token] = new LeLogger($token, $persistent, $ssl, $severity, $datahubEnabled, $datahubIPAddress, $port, $host_id, $host_name, $host_name_enabled, $add_local_timestamp); } return self::$m_instance[$token]; @@ -87,7 +84,7 @@ public static function tearDown() self::$m_instance = array(); } - private function __construct($token, $persistent, $ssl, $severity, $datahubEnabled, $datahubIPAddress, $datahubPort, $host_id, $host_name, $host_name_enabled, $add_local_timestamp) + private function __construct($token, $persistent, $ssl, $severity, $datahubEnabled, $datahubIPAddress, $port, $host_id, $host_name, $host_name_enabled, $add_local_timestamp) { if ($datahubEnabled===true) @@ -99,7 +96,6 @@ private function __construct($token, $persistent, $ssl, $severity, $datahubEnabl // set Datahub variable values $this->_datahubIPAddress = $datahubIPAddress; $this->use_datahub = $datahubEnabled; - $this->_datahubPort = $datahubPort; // if datahub is being used the logToken should be set to null @@ -157,6 +153,8 @@ private function __construct($token, $persistent, $ssl, $severity, $datahubEnabl $this->severity = $severity; $this->connectionTimeout = (float) ini_get('default_socket_timeout'); + + $this->port = $port; } @@ -206,18 +204,7 @@ public function getToken() public function getPort() { - if ($this->isTLS()) - { - return self::LE_TLS_PORT; - } - elseif ($this->isDatahub() ) - { - return $this->_datahubPort; - } - else - { - return self::LE_PORT; - } + return $this->port; } From 4de6733367ad8f583d8be349f68ff748dbbb8729 Mon Sep 17 00:00:00 2001 From: Olof Johansson Date: Wed, 23 Dec 2015 10:05:31 +0100 Subject: [PATCH 2/6] Fixed testGetPort. --- unit_tests/LeLoggerTests.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unit_tests/LeLoggerTests.php b/unit_tests/LeLoggerTests.php index b312864..e624807 100644 --- a/unit_tests/LeLoggerTests.php +++ b/unit_tests/LeLoggerTests.php @@ -82,7 +82,7 @@ public function testGetPort() $this->tearDown(); - $log = LeLogger::getLogger('token', true, true, LOG_DEBUG, false, "", 10000, "", "", false, true); + $log = LeLogger::getLogger('token', true, true, LOG_DEBUG, false, "", 20000, "", "", false, true); $this->assertEquals(20000, $log->getPort()); } From 4cb76923735371806f11dfac267e64f2e77775ef Mon Sep 17 00:00:00 2001 From: Olof Johansson Date: Wed, 9 Mar 2016 08:29:48 +0100 Subject: [PATCH 3/6] =?UTF-8?q?Fixed=20address=20f=C3=B6r=20TCP=20connecti?= =?UTF-8?q?ons.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The address should be data.logentries.com for TCP connections, according to https://logentries.com/doc/input-token/. --- LeLogger.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LeLogger.php b/LeLogger.php index 6079a7f..d0ed3ca 100644 --- a/LeLogger.php +++ b/LeLogger.php @@ -32,7 +32,7 @@ class LeLogger */ // Logentries server address for receiving logs - const LE_ADDRESS = 'tcp://api.logentries.com'; + const LE_ADDRESS = 'tcp://data.logentries.com'; // Logentries server address for receiving logs via TLS const LE_TLS_ADDRESS = 'tls://api.logentries.com'; From e318d0b6740e936eff3409403e77ced56eec8b76 Mon Sep 17 00:00:00 2001 From: Olof Johansson Date: Wed, 9 Mar 2016 08:51:05 +0100 Subject: [PATCH 4/6] Fixed testGetAddress according to 4cb7692. --- unit_tests/LeLoggerTests.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unit_tests/LeLoggerTests.php b/unit_tests/LeLoggerTests.php index e624807..63b806c 100644 --- a/unit_tests/LeLoggerTests.php +++ b/unit_tests/LeLoggerTests.php @@ -91,7 +91,7 @@ public function testGetAddress() { $log = LeLogger::getLogger('token', true, false, LOG_DEBUG, false, "", 10000, "", "", false, true); - $this->assertEquals('tcp://api.logentries.com', $log->getAddress()); + $this->assertEquals('tcp://data.logentries.com', $log->getAddress()); $this->tearDown(); $log = LeLogger::getLogger('token', true, true, LOG_DEBUG, false, "", 10000, "", "", false, true); From 2f2b32699eb40dfa9edfa3846549d6415b778f42 Mon Sep 17 00:00:00 2001 From: Olof Johansson Date: Wed, 9 Mar 2016 08:52:14 +0100 Subject: [PATCH 5/6] Force the port for TLS connections. The only supported port for TLS is 2000. --- LeLogger.php | 12 +++++++++++- unit_tests/LeLoggerTests.php | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/LeLogger.php b/LeLogger.php index d0ed3ca..1a6bda6 100644 --- a/LeLogger.php +++ b/LeLogger.php @@ -35,6 +35,8 @@ class LeLogger const LE_ADDRESS = 'tcp://data.logentries.com'; // Logentries server address for receiving logs via TLS const LE_TLS_ADDRESS = 'tls://api.logentries.com'; + // Logentries server port for receiving logs with TLS by token + const LE_TLS_PORT = 20000; private $resource = null; @@ -204,7 +206,15 @@ public function getToken() public function getPort() { - return $this->port; + if ($this->isTLS()) + { + return self::LE_TLS_PORT; + } + else + { + return $this->port; + } + } diff --git a/unit_tests/LeLoggerTests.php b/unit_tests/LeLoggerTests.php index 63b806c..fd0da9c 100644 --- a/unit_tests/LeLoggerTests.php +++ b/unit_tests/LeLoggerTests.php @@ -82,7 +82,7 @@ public function testGetPort() $this->tearDown(); - $log = LeLogger::getLogger('token', true, true, LOG_DEBUG, false, "", 20000, "", "", false, true); + $log = LeLogger::getLogger('token', true, true, LOG_DEBUG, false, "", 0, "", "", false, true); $this->assertEquals(20000, $log->getPort()); } From 7056a4e6ba220f0408c4ddeb17d4dc7523d56fdc Mon Sep 17 00:00:00 2001 From: Erik Johansson Date: Fri, 25 Aug 2017 11:38:17 +0200 Subject: [PATCH 6/6] Make connection timeout configurable. - Added new parameter to constructor which sets the connection timeout to Logentires requests. - The timeout parameter should be defined in seconds. --- LeLogger.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/LeLogger.php b/LeLogger.php index 1a6bda6..8895240 100644 --- a/LeLogger.php +++ b/LeLogger.php @@ -68,11 +68,11 @@ class LeLogger private $errstr; - public static function getLogger($token, $persistent, $ssl, $severity, $datahubEnabled, $datahubIPAddress, $port, $host_id, $host_name, $host_name_enabled, $add_local_timestamp) + public static function getLogger($token, $persistent, $ssl, $severity, $datahubEnabled, $datahubIPAddress, $connectionTimeout, $port, $host_id, $host_name, $host_name_enabled, $add_local_timestamp) { if ( ! isset(self::$m_instance[$token])) { - self::$m_instance[$token] = new LeLogger($token, $persistent, $ssl, $severity, $datahubEnabled, $datahubIPAddress, $port, $host_id, $host_name, $host_name_enabled, $add_local_timestamp); + self::$m_instance[$token] = new LeLogger($token, $persistent, $ssl, $severity, $datahubEnabled, $datahubIPAddress, $connectionTimeout, $port, $host_id, $host_name, $host_name_enabled, $add_local_timestamp); } return self::$m_instance[$token]; @@ -86,7 +86,7 @@ public static function tearDown() self::$m_instance = array(); } - private function __construct($token, $persistent, $ssl, $severity, $datahubEnabled, $datahubIPAddress, $port, $host_id, $host_name, $host_name_enabled, $add_local_timestamp) + private function __construct($token, $persistent, $ssl, $severity, $datahubEnabled, $datahubIPAddress, $connectionTimeout, $port, $host_id, $host_name, $host_name_enabled, $add_local_timestamp) { if ($datahubEnabled===true) @@ -154,7 +154,7 @@ private function __construct($token, $persistent, $ssl, $severity, $datahubEnabl $this->severity = $severity; - $this->connectionTimeout = (float) ini_get('default_socket_timeout'); + $this->connectionTimeout = $connectionTimeout; $this->port = $port; }