mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-22 08:44:01 +00:00
Code Issues Projects Releases Wiki Activity

RakLibServer: do not try to export exceptions across threads (they might contain Threaded objects whose references get invalidated)

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-12-01 22:31:55 +00:00
parent cc473184ac
commit 541cfee615
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/mcpe/raklib/RakLibInterface.php
View File

@ -125,7 +125,7 @@ class RakLibInterface implements ServerEventListener, AdvancedNetworkInterface{
if(!$this->rakLib->isRunning()){
$e = $this->rakLib->getCrashInfo();
if($e !== null){
throw $e;
throw new \RuntimeException("RakLib crashed: $e");
}
throw new \Exception("RakLib Thread crashed without crash information");
}

18
src/network/mcpe/raklib/RakLibServer.php
View File

@ -69,7 +69,7 @@ class RakLibServer extends Thread{
/** @var SleeperNotifier */
protected $mainThreadNotifier;
/** @var \Throwable|null */
/** @var string|null */
public $crashInfo = null;
/**
@ -111,22 +111,22 @@ class RakLibServer extends Thread{
if($error !== null){
$this->logger->emergency("Fatal error: " . $error["message"] . " in " . $error["file"] . " on line " . $error["line"]);
$this->setCrashInfo(new \ErrorException($error['message'], 0, $error['type'], $error['file'], $error['line']));
$this->setCrashInfo($error['message']);
}else{
$this->logger->emergency("RakLib shutdown unexpectedly");
}
}
}
public function getCrashInfo() : ?\Throwable{
public function getCrashInfo() : ?string{
return $this->crashInfo;
}
private function setCrashInfo(\Throwable $e) : void{
$this->synchronized(function(\Throwable $e) : void{
$this->crashInfo = $e;
private function setCrashInfo(string $info) : void{
$this->synchronized(function(string $info) : void{
$this->crashInfo = $info;
$this->notify();
}, $e);
}, $info);
}
public function startAndWait(int $options = PTHREADS_INHERIT_NONE) : void{
@ -136,7 +136,7 @@ class RakLibServer extends Thread{
$this->wait();
}
if($this->crashInfo !== null){
throw $this->crashInfo;
throw new \RuntimeException("RakLib failed to start: $this->crashInfo");
}
});
}
@ -167,7 +167,7 @@ class RakLibServer extends Thread{
$manager->run();
$this->cleanShutdown = true;
}catch(\Throwable $e){
$this->setCrashInfo($e);
$this->setCrashInfo($e->getMessage());
$this->logger->logException($e);
}
}