Mirrors/SmartHomePHP
2
0
Fork 0
mirror of https://github.com/CyanoFresh/SmartHomePHP.git synced 2026-03-06 18:06:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Alex Solomaha
2016-11-18 23:03:18 +02:00
parent ea5fddf5f2
commit 08837c2fa6
2 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/params.php
View File

@@ -9,6 +9,9 @@ $params = [
'pushAllKey' => '83a29d6a4bb068458d375daaa16039c4',
'maxLoginFailCount' => 5,
'loginFailTimeout' => 600,
'server' => [
'connectionCheckTimeout' => 180,
],
];
return ArrayHelper::merge($params, require 'params-local.php');

49
servers/Panel.php
View File

@@ -183,29 +183,32 @@ class Panel implements MessageComponentInterface
$conn->Board = $board;
$this->board_clients[$board->id] = $conn;
$this->isConnectedTimers[$board->id] = $this->loop->addPeriodicTimer(180, function () use ($board) {
$this->log("Checking for timeout [$board->id] board...");
$this->isConnectedTimers[$board->id] = $this->loop->addPeriodicTimer(
Yii::$app->params['server']['connectionCheckTimeout'],
function () use ($board) {
$this->log("Checking for timeout [$board->id] board...");
if (!isset($this->board_clients[$board->id])) {
$this->logBoardConnection($board, false);
if (!isset($this->board_clients[$board->id])) {
$this->logBoardConnection($board, false);
return $this->log("Board [$board->id] has already been disconnected!");
return $this->log("Board [$board->id] has already been disconnected!");
}
if (isset($this->awaitingPong[$board->id])) {
$this->log("There was no pong from last ping! Disconnecting...");
return $this->board_clients[$board->id]->close();
}
$this->log("Sending ping command...");
$this->awaitingPong[$board->id] = true;
return $this->sendToBoard($board->id, [
'type' => 'ping',
]);
}
if (isset($this->awaitingPong[$board->id])) {
$this->log("There was no pong from last ping! Disconnecting...");
return $this->board_clients[$board->id]->close();
}
$this->log("Sending ping command...");
$this->awaitingPong[$board->id] = true;
return $this->sendToBoard($board->id, [
'type' => 'ping',
]);
});
);
$this->logBoardConnection($board, true);
@@ -282,7 +285,7 @@ class Panel implements MessageComponentInterface
}
if (isset($this->awaitingPong[$boardId])) {
$this->log("Removing from pong list...");
$this->log("Removing from awaiting pong list...");
unset($this->awaitingPong[$boardId]);
@@ -338,10 +341,10 @@ class Panel implements MessageComponentInterface
$board = $from->Board;
$data = Json::decode($msg);
$this->log("Removing board [$board->id] from timeout queue");
if (isset($this->awaitingPong[$board->id])) {
unset($this->awaitingPong[$board->id]);
$this->log("Removed board [$board->id] from timeout queue");
}
switch ($data['type']) {