Removed killing php to end the process

This commit is contained in:
Shoghi Cervantes Pueyo 2013-04-03 12:21:12 +02:00
parent e0747a9c44
commit dbc357c266
5 changed files with 6 additions and 23 deletions

View File

@ -35,5 +35,4 @@ require_once(FILE_PATH."/src/dependencies.php");
$server = new ServerAPI();
$server->run();
kill(getmypid()); //Fix for segfault
exit(0);

View File

@ -209,7 +209,8 @@ class ConsoleAPI{
}
class ConsoleLoop extends Thread{
public $line, $stop;
public $line;
public $stop;
public function __construct(){
$this->line = false;
$this->stop = false;

View File

@ -315,7 +315,6 @@ class ServerAPI{
$this->server->init();
unregister_tick_function(array($this->server, "tick"));
$this->__destruct();
unset($this->server);
if($this->getProperty("upnp-forwarding") === true ){
console("[INFO] [UPnP] Removing port forward...");
UPnP_RemovePortForward($this->getProperty("port"));

View File

@ -462,6 +462,9 @@ class PocketMinecraftServer{
}
public function dumpError(){
if($this->stop === true){
return;
}
console("[ERROR] An Unrecovereable has ocurred and the server has Crashed. Creating an Error Dump");
$dump = "# PocketMine-MP Error Dump ".date("D M j H:i:s T Y")."\r\n";
$er = error_get_last();

View File

@ -25,25 +25,6 @@ the Free Software Foundation, either version 3 of the License, or
*/
function kill($pid){
switch(Utils::getOS()){
case "win":
ob_start();
passthru("%WINDIR%\\System32\\taskkill.exe /F /PID ".((int) $pid));
ob_end_clean();
break;
case "mac":
case "linux":
default:
ob_start();
passthru("kill -9 ".((int) $pid));
ob_end_clean();
}
}
function require_all($path, &$count = 0){
$dir = dir($path."/");
$dirs = array();