mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-12 16:59:44 +00:00
Code Issues Projects Releases Wiki Activity

NetworkSession: fix some blind spots on logging

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-06-18 15:01:44 +01:00
parent 9df2ca3655
commit 94299534b3
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/pocketmine/network/mcpe/NetworkSession.php
View File

@ -79,6 +79,7 @@ use pocketmine\PlayerInfo;
use pocketmine\Server;
use pocketmine\timings\Timings;
use pocketmine\utils\BinaryDataException;
use pocketmine\utils\TextFormat;
use pocketmine\utils\Utils;
use pocketmine\world\Position;
use function array_map;
@ -154,6 +155,7 @@ class NetworkSession{
$this->setHandler(new LoginSessionHandler($this->server, $this));
$this->manager->add($this);
$this->logger->info("Session opened");
}
private function getLogPrefix() : string{
@ -195,6 +197,7 @@ class NetworkSession{
throw new \InvalidStateException("Player info has already been set");
}
$this->info = $info;
$this->logger->info("Player: " . TextFormat::AQUA . $info->getUsername() . TextFormat::RESET);
$this->logger->setPrefix($this->getLogPrefix());
}
@ -431,7 +434,7 @@ class NetworkSession{
$this->interface->putPacket($this, $payload, $immediate);
}
private function tryDisconnect(\Closure $func) : void{
private function tryDisconnect(\Closure $func, string $reason) : void{
if($this->connected and !$this->disconnectGuard){
$this->disconnectGuard = true;
$func();
@ -439,6 +442,7 @@ class NetworkSession{
$this->setHandler(NullSessionHandler::getInstance());
$this->connected = false;
$this->manager->remove($this);
$this->logger->info("Session closed due to $reason");
}
}
@ -454,7 +458,7 @@ class NetworkSession{
$this->player->disconnect($reason, null, $notify);
}
$this->doServerDisconnect($reason, $notify);
});
}, $reason);
}
/**
@ -474,7 +478,7 @@ class NetworkSession{
$this->player->disconnect($reason, null, false);
}
$this->doServerDisconnect($reason, false);
});
}, $reason);
}
/**
@ -486,7 +490,7 @@ class NetworkSession{
public function onPlayerDestroyed(string $reason, bool $notify = true) : void{
$this->tryDisconnect(function() use ($reason, $notify){
$this->doServerDisconnect($reason, $notify);
});
}, $reason);
}
/**
@ -514,7 +518,7 @@ class NetworkSession{
if($this->player !== null){
$this->player->disconnect($reason, null, false);
}
});
}, $reason);
}
public function setAuthenticationStatus(bool $authenticated, bool $authRequired, ?string $error) : bool{