Skip to content

allow switching/extending logs #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

allow switching/extending logs #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de83ba1
allow disabling/extending logs
soif May 23, 2017
2d92be1
use log method
soif May 23, 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
13 changes: 12 additions & 1 deletion sock/SocketServer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ class SocketServer {
protected $port;
protected $_listenLoop;
protected $connectionHandler;
protected $show_log=true;

public function __construct( $port = 4444, $address = '127.0.0.1' ) {
$this->address = $address;
Expand Down Expand Up @@ -62,7 +63,17 @@ public function listen() {
}

protected function beforeServerLoop() {
printf( "Listening on %s:%d...\n", $this->address, $this->port );
$this->log( "Listening on {$this->address}:{$this->port}...\n");
}

public function showLog($bool=true) {
$this->show_log=$bool;
}

protected function log($msg) {
if($this->show_log){
echo($msg);
}
}

protected function serverLoop() {
Expand Down
45 changes: 22 additions & 23 deletions sock/SocketServerBroadcast.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ class SocketServerBroadcast extends SocketServer {
public function __construct( $port = 4444, $address = '127.0.0.1' ) {
parent::__construct( $port, $address );
$this->pid = posix_getpid();
if(!file_exists(self::PIPENAME)) {
umask(0);
if( ! posix_mkfifo(self::PIPENAME, 0666 ) ) {
die('Cant create a pipe: "' . self::PIPENAME . '"');
}
if(!file_exists(self::PIPENAME)) {
umask(0);
if( ! posix_mkfifo(self::PIPENAME, 0666 ) ) {
die('Cant create a pipe: "' . self::PIPENAME . '"');
}
}
$this->pipe = fopen(self::PIPENAME, 'r+');
}
Expand All @@ -35,12 +35,11 @@ public function handleProcess() {
if( $message['type'] == 'msg' ) {
$client = $this->connections[ $message['pid'] ];
$msg = sprintf('[%s] (%d):%s', $client->getAddress(), $message['pid'], $message['data'] );
printf( "Broadcast: %s", $msg );
$this->log( "Broadcast: $msg\n");
foreach( $this->connections as $pid => $conn ) {
if( $pid == $message['pid'] ) {
continue;
}

$conn->send( $msg );
}
}
Expand All @@ -52,9 +51,9 @@ public function handleProcess() {
public function bytesToInt($char) {
$num = ord($char[0]);
$num += ord($char[1]) << 8;
$num += ord($char[2]) << 16;
$num += ord($char[3]) << 24;
return $num;
$num += ord($char[2]) << 16;
$num += ord($char[3]) << 24;
return $num;
}

protected function beforeServerLoop() {
Expand Down Expand Up @@ -88,8 +87,8 @@ protected function serverLoop() {
}

if( ! $childPid ) {
// force child process to exit from loop
return;
// force child process to exit from loop
return;
}

$this->connections[ $childPid ] = $socketClient;
Expand All @@ -102,20 +101,20 @@ public function broadcast( Array $msg ) {
$message = serialize( $msg );
$f = fopen(self::PIPENAME, 'w+');
if( !$f ) {
echo "ERROR: Can't open PIPE for writting\n";
$this->log("ERROR: Can't open PIPE for writting\n");
return;
}
fwrite($f, $this->strlenInBytes($message) . $message );
fclose($f);
fwrite($f, $this->strlenInBytes($message) . $message );
fclose($f);
posix_kill($this->pid, SIGUSR1);
}

protected function strlenInBytes($str) {
$len = strlen($str);
$chars = chr( $len & 0xFF );
$chars .= chr( ($len >> 8 ) & 0xFF );
$chars .= chr( ($len >> 16 ) & 0xFF );
$chars .= chr( ($len >> 24 ) & 0xFF );
return $chars;
protected function strlenInBytes($str) {
$len = strlen($str);
$chars = chr( $len & 0xFF );
$chars .= chr( ($len >> 8 ) & 0xFF );
$chars .= chr( ($len >> 16 ) & 0xFF );
$chars .= chr( ($len >> 24 ) & 0xFF );
return $chars;
}
}
}