diff --git a/globals/Dependencies/Grid/RccServiceHelper.php b/globals/Dependencies/Grid/RccServiceHelper.php index 4090951..dc073b6 100644 --- a/globals/Dependencies/Grid/RccServiceHelper.php +++ b/globals/Dependencies/Grid/RccServiceHelper.php @@ -88,37 +88,37 @@ namespace Alphaland\Grid { ); } - public function GetVersion(): stdClass + public function GetVersion() { return $this->SoapCallService("GetVersion"); } - public function HelloWorld(): stdClass + public function HelloWorld() { return $this->SoapCallService("HelloWorld"); } - public function CloseAllJobs(): stdClass + public function CloseAllJobs() { return $this->SoapCallService("CloseAllJobs"); } - public function CloseExpiredJobs(): stdClass + public function CloseExpiredJobs() { return $this->SoapCallService("CloseExpiredJobs"); } - public function GetAllJobsEx(): stdClass + public function GetAllJobsEx() { return $this->SoapCallService("GetAllJobsEx"); } - public function GetStatus(): stdClass + public function GetStatus() { return $this->SoapCallService("GetStatus"); } - public function DiagEx(string $type, string $jobid): stdClass + public function DiagEx(string $type, string $jobid) { return $this->SoapCallService("DiagEx", array("type" => $type, "jobID" => $jobid)); } @@ -126,22 +126,22 @@ namespace Alphaland\Grid { // this doesn't return anything // austin: i know this doesnt return anything // https://pastebin.com/raw/pr5NDBwC - public function CloseJob(string $jobid): stdClass + public function CloseJob(string $jobid) { return $this->SoapCallService("CloseJob", array("jobID" => $jobid)); } - public function GetExpiration(string $jobid): stdClass + public function GetExpiration(string $jobid) { return $this->SoapCallService("GetExpiration", array("jobID" => $jobid)); } - public function RenewLease(string $jobid, int $expiration): stdClass + public function RenewLease(string $jobid, int $expiration) { return $this->SoapCallService("RenewLease", array("jobID" => $jobid, "expirationInSeconds" => $expiration)); } - public function ExecuteEx(array $soapargs = []): stdClass + public function ExecuteEx(array $soapargs = []) { return $this->SoapCallService( "ExecuteEx", @@ -149,7 +149,7 @@ namespace Alphaland\Grid { ); } - public function OpenJobEx(array $soapargs = []): stdClass + public function OpenJobEx(array $soapargs = []) { return $this->SoapCallService( "OpenJobEx", @@ -157,7 +157,7 @@ namespace Alphaland\Grid { ); } - public function BatchJobEx(array $soapargs = []): stdClass + public function BatchJobEx(array $soapargs = []) { return $this->SoapCallService( "BatchJobEx", diff --git a/globals/functions.php b/globals/functions.php index 332d9ef..0f4663b 100644 --- a/globals/functions.php +++ b/globals/functions.php @@ -3862,51 +3862,16 @@ function luaArguments($arguments=[]) //arguments for a script being executed } } -function soapGetVersion($arbiter) -{ - return soapCallService($arbiter, "GetVersion"); -} - -function soapHelloWorld($arbiter) -{ - return soapCallService($arbiter, "HelloWorld"); -} - function soapCloseAllJobs($arbiter) { return soapCallService($arbiter, "CloseAllJobs"); } -function soapCloseExpiredJobs($arbiter) -{ - return soapCallService($arbiter, "CloseExpiredJobs"); -} - -function soapGetAllJobsEx($arbiter) -{ - return soapCallService($arbiter, "GetAllJobsEx"); -} - -function soapGetStatus($arbiter) -{ - return soapCallService($arbiter, "GetStatus"); -} - -function soapDiagEx($arbiter, $type, $jobid) -{ - return soapCallService($arbiter, "DiagEx", array("type" => $type, "jobID" => $jobid)); -} - function soapCloseJob($arbiter, $jobid) { return soapCallService($arbiter, "CloseJob", array("jobID" => $jobid)); } -function soapGetExpiration($arbiter, $jobid) -{ - return soapCallService($arbiter, "GetExpiration", array("jobID" => $jobid)); -} - function soapExecuteEx($arbiter, $jobid, $scriptname, $script, $arguments=[]) { return soapCallService($arbiter, "ExecuteEx", array( @@ -3920,16 +3885,6 @@ function soapExecuteEx($arbiter, $jobid, $scriptname, $script, $arguments=[]) ); } -function soapRenewLease($arbiter, $jobid, $expiration) -{ - return soapCallService($arbiter, "RenewLease", array("jobID" => $jobid, "expirationInSeconds" => $expiration)); -} - -function soapOpenJobEx($arbiter, $jobid, $expiration, $scriptname, $script, $arguments=[]) -{ - return soapJobTemplate($arbiter, "OpenJobEx", $jobid, $expiration, 1, 3, $scriptname, $script, $arguments); -} - function soapBatchJobEx($arbiter, $jobid, $expiration, $scriptname, $script, $arguments=[]) { return soapJobTemplate($arbiter, "BatchJobEx", $jobid, $expiration, 1, 3, $scriptname, $script, $arguments);