mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-12 22:45:28 +00:00
Code Issues Projects Releases Wiki Activity

Added GIT_COMMIT to the Error dump

Browse Source
This commit is contained in:
Shoghi Cervantes Pueyo 2013-04-25 17:54:32 +02:00
parent 33a614c615
commit 173784752e
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/API/ServerAPI.php
View File

@ -133,11 +133,6 @@ class ServerAPI{
$this->setProperty("server-id", $this->server->serverID); $this->setProperty("server-id", $this->server->serverID);
} }
$this->server->api = $this; $this->server->api = $this;
$gitsha1 = false;
if(file_exists(FILE_PATH.".git/refs/heads/master")){ //Found Git information!
$gitsha1 = trim(file_get_contents(FILE_PATH.".git/refs/heads/master"));
console("[GIT] Commit \x1b[33m".$gitsha1);
}
if($this->getProperty("upnp-forwarding") === true){ if($this->getProperty("upnp-forwarding") === true){
console("[INFO] [UPnP] Trying to port forward..."); console("[INFO] [UPnP] Trying to port forward...");
@ -155,7 +150,7 @@ class ServerAPI{
console("[ERROR] PocketMine API error"); console("[ERROR] PocketMine API error");
}else{ }else{
$last = $info["development"]["date"]; $last = $info["development"]["date"];
if($last >= $this->getProperty("last-update") and $this->getProperty("last-update") !== false and $gitsha1 != $info["development"]["commit"]){ if($last >= $this->getProperty("last-update") and $this->getProperty("last-update") !== false and GIT_COMMIT != $info["development"]["commit"]){
console("[NOTICE] \x1b[33mA new DEVELOPMENT version of PocketMine-MP has been released"); console("[NOTICE] \x1b[33mA new DEVELOPMENT version of PocketMine-MP has been released");
console("[NOTICE] \x1b[33mVersion \"".$info["development"]["version"]."\" [".substr($info["development"]["commit"], 0, 10)."]"); console("[NOTICE] \x1b[33mVersion \"".$info["development"]["version"]."\" [".substr($info["development"]["commit"], 0, 10)."]");
console("[NOTICE] \x1b[36mIf you want to update, get the latest version at ".$info["development"]["download"]); console("[NOTICE] \x1b[36mIf you want to update, get the latest version at ".$info["development"]["download"]);

1
src/PocketMinecraftServer.php
View File

@ -453,6 +453,7 @@ class PocketMinecraftServer{
$dump .= "\r\n\r\n"; $dump .= "\r\n\r\n";
$version = new VersionString(); $version = new VersionString();
$dump .= "PM Version: ".$version." #".$version->getNumber()." [Protocol ".CURRENT_PROTOCOL."]\r\n"; $dump .= "PM Version: ".$version." #".$version->getNumber()." [Protocol ".CURRENT_PROTOCOL."]\r\n";
$dump .= "Commit: ".GIT_COMMIT."\r\n";
$dump .= "uname -a: ".php_uname("a")."\r\n"; $dump .= "uname -a: ".php_uname("a")."\r\n";
$dump .= "PHP Version: " .phpversion()."\r\n"; $dump .= "PHP Version: " .phpversion()."\r\n";
$dump .= "Zend version: ".zend_version()."\r\n"; $dump .= "Zend version: ".zend_version()."\r\n";

8
src/config.php
View File

@ -48,4 +48,10 @@ define("CURRENT_STRUCTURE", 5);
define("CURRENT_PROTOCOL", 9); define("CURRENT_PROTOCOL", 9);
define("CURRENT_MINECRAFT_VERSION", "0.6.1 alpha"); define("CURRENT_MINECRAFT_VERSION", "0.6.1 alpha");
define("CURRENT_API_VERSION", 6); define("CURRENT_API_VERSION", 6);
define("CURRENT_PHP_VERSION", "5.5"); define("CURRENT_PHP_VERSION", "5.5");
$gitsha1 = false;
if(file_exists(FILE_PATH.".git/refs/heads/master")){ //Found Git information!
define(GIT_COMMIT, strtolower(trim(file_get_contents(FILE_PATH.".git/refs/heads/master"))));
}else{ //Unknown :(
define(GIT_COMMIT, str_repeat("00", 20));
}