mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-27 21:59:52 +00:00
Code Issues Projects Releases Wiki Activity

Improved git hash handling, add dirty git detection and disable automatic reporting for dirty builds

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-06-22 12:12:55 +01:00
parent 7ba807fd42
commit 6a2a74a457
3 changed files with 44 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/pocketmine/PocketMine.php
View File

@ -467,18 +467,16 @@ namespace pocketmine {
} }
$gitHash = str_repeat("00", 20); $gitHash = str_repeat("00", 20);
if(file_exists(\pocketmine\PATH . ".git/HEAD")){ //Found Git information! #ifndef COMPILE
$ref = trim(file_get_contents(\pocketmine\PATH . ".git/HEAD")); if(\Phar::running(true) === ""){
if(preg_match('/^[0-9a-f]{40}$/i', $ref)){ if(Utils::execute("git rev-parse HEAD", $out) === 0){
$gitHash = strtolower($ref); $gitHash = trim($out);
}elseif(substr($ref, 0, 5) === "ref: "){ if(Utils::execute("git diff --quiet") === 1 or Utils::execute("git diff --cached --quiet") === 1){ //Locally-modified
$refFile = \pocketmine\PATH . ".git/" . substr($ref, 5); $gitHash .= "-dirty";
if(is_file($refFile)){
$gitHash = strtolower(trim(file_get_contents($refFile)));
} }
} }
} }
#endif
define('pocketmine\GIT_COMMIT', $gitHash); define('pocketmine\GIT_COMMIT', $gitHash);

5
src/pocketmine/Server.php
View File

@ -2159,6 +2159,11 @@ class Server{
$report = false; $report = false;
} }
if(strrpos(\pocketmine\GIT_COMMIT, "-dirty") !== false){
$this->logger->debug("Not sending crashdump due to locally modified");
$report = false; //Don't send crashdumps for locally modified builds
}
if($report){ if($report){
$url = ($this->getProperty("auto-report.use-https", true) ? "https" : "http") . "://" . $this->getProperty("auto-report.host", "crash.pmmp.io") . "/submit/api"; $url = ($this->getProperty("auto-report.use-https", true) ? "https" : "http") . "://" . $this->getProperty("auto-report.host", "crash.pmmp.io") . "/submit/api";
$reply = Utils::postURL($url, [ $reply = Utils::postURL($url, [

32
src/pocketmine/utils/Utils.php
View File

@ -492,4 +492,36 @@ class Utils{
} }
return $hash; return $hash;
} }
/**
* @param string $command Command to execute
* @param string|null &$stdout Reference parameter to write stdout to
* @param string|null &$stderr Reference parameter to write stderr to
*
* @return int process exit code
*/
public static function execute(string $command, string &$stdout = null, string &$stderr = null) : int{
$process = proc_open($command, [
["pipe", "r"],
["pipe", "w"],
["pipe", "w"]
], $pipes);
if($process === false){
$stderr = "Failed to open process";
$stdout = "";
return -1;
}
$stdout = stream_get_contents($pipes[1]);
$stderr = stream_get_contents($pipes[2]);
foreach($pipes as $p){
fclose($p);
}
return proc_close($process);
}
} }