cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-10 18:11:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26267 from MrStonedOne/patch-344

Browse Source 
Fixes Pull Request announcements not working in certain situations
This commit is contained in:
Jordie
2017-04-17 15:27:18 +10:00
committed by GitHub
parent 76b2a70835 8f159e0e93
commit 68acf2bd90
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tools/github_webhook_processor.php
View File

@@ -423,13 +423,13 @@ function checkchangelog($payload, $merge = false, $compile = true) {
function sendtoallservers($str, $payload = null) { function sendtoallservers($str, $payload = null) {
global $servers; global $servers;
foreach ($servers as $serverid => $server) {
if (isset($server['comskey']))
$str .= '&key='.urlencode($server['comskey']);
if (!empty($payload)) if (!empty($payload))
$str .= '&payload='.urlencode(json_encode($payload)); $str .= '&payload='.urlencode(json_encode($payload));
$rtn = export($server['address'], $server['port'], $str); foreach ($servers as $serverid => $server) {
$msg = $str;
if (isset($server['comskey']))
$msg .= '&key='.urlencode($server['comskey']);
$rtn = export($server['address'], $server['port'], $msg);
echo "Server Number $serverid replied: $rtn\n"; echo "Server Number $serverid replied: $rtn\n";
} }
} }
@@ -437,7 +437,6 @@ function sendtoallservers($str, $payload = null) {
function export($addr, $port, $str) { function export($addr, $port, $str) {
global $error;
// All queries must begin with a question mark (ie "?players") // All queries must begin with a question mark (ie "?players")
if($str{0} != '?') $str = ('?' . $str); if($str{0} != '?') $str = ('?' . $str);
@@ -448,8 +447,7 @@ function export($addr, $port, $str) {
$server = socket_create(AF_INET,SOCK_STREAM,SOL_TCP) or exit("ERROR"); $server = socket_create(AF_INET,SOCK_STREAM,SOL_TCP) or exit("ERROR");
socket_set_option($server, SOL_SOCKET, SO_SNDTIMEO, array('sec' => 2, 'usec' => 0)); //sets connect and send timeout to 2 seconds socket_set_option($server, SOL_SOCKET, SO_SNDTIMEO, array('sec' => 2, 'usec' => 0)); //sets connect and send timeout to 2 seconds
if(!socket_connect($server,$addr,$port)) { if(!socket_connect($server,$addr,$port)) {
$error = true; return "ERROR: Connection failed";
return "ERROR";
} }
@@ -460,7 +458,8 @@ function export($addr, $port, $str) {
//echo $bytessent.'<br>'; //echo $bytessent.'<br>';
$result = socket_write($server,substr($query,$bytessent),$bytestosend-$bytessent); $result = socket_write($server,substr($query,$bytessent),$bytestosend-$bytessent);
//echo 'Sent '.$result.' bytes<br>'; //echo 'Sent '.$result.' bytes<br>';
if ($result===FALSE) die(socket_strerror(socket_last_error())); if ($result===FALSE)
return "ERROR: " . socket_strerror(socket_last_error());
$bytessent += $result; $bytessent += $result;
} }
@@ -492,8 +491,6 @@ function export($addr, $port, $str) {
} }
} }
} }
//if we get to this point, something went wrong; return "";
$error = true;
return "ERROR";
} }
?> ?>