Skip to content
This repository was archived by the owner on Dec 14, 2023. It is now read-only.

Make the port number configurable. #16

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Make the port number configurable. #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6077ef0
Make the port number configurable.
Dec 23, 2015
4de6733
Fixed testGetPort.
Dec 23, 2015
4cb7692
Fixed address för TCP connections.
Mar 9, 2016
e318d0b
Fixed testGetAddress according to 4cb7692.
Mar 9, 2016
2f2b326
Force the port for TLS connections.
Mar 9, 2016
7056a4e
Make connection timeout configurable.
Aug 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions LeLogger.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,9 @@ 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';
// 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;

Expand All @@ -46,7 +44,8 @@ class LeLogger

private $_datahubIPAddress = "";
private $use_datahub = false;
private $_datahubPort = 10000;

private $port = false;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A default port should be specified (10000) to avoid breaking current usage.


private $use_host_name = false;
private $_host_name = "";
Expand All @@ -69,11 +68,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, $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, $datahubPort, $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];
Expand All @@ -87,7 +86,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, $connectionTimeout, $port, $host_id, $host_name, $host_name_enabled, $add_local_timestamp)
{

if ($datahubEnabled===true)
Expand All @@ -99,7 +98,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
Expand Down Expand Up @@ -156,7 +154,9 @@ 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;
}


Expand Down Expand Up @@ -210,14 +210,11 @@ public function getPort()
{
return self::LE_TLS_PORT;
}
elseif ($this->isDatahub() )
{
return $this->_datahubPort;
}
else
{
return self::LE_PORT;
return $this->port;
}

}


Expand Down
4 changes: 2 additions & 2 deletions unit_tests/LeLoggerTests.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, "", 0, "", "", false, true);

$this->assertEquals(20000, $log->getPort());
}
Expand All @@ -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);
Expand Down