Merge branch '3.5' into 3.6

This commit is contained in:
Dylan K. Taylor 2019-02-10 17:15:48 +00:00
commit 8bd8da4bc6

View File

@ -124,7 +124,6 @@ use function file_put_contents;
use function filemtime;
use function floor;
use function function_exists;
use function gc_collect_cycles;
use function get_class;
use function getmypid;
use function getopt;
@ -2148,9 +2147,6 @@ class Server{
$this->network->unregisterInterface($interface);
}
}
$this->getLogger()->debug("Collecting cycles");
gc_collect_cycles();
}catch(\Throwable $e){
$this->logger->logException($e);
$this->logger->emergency("Crashed while crashing, killing process");