1
0
Эх сурвалжийг харах

Testing Custom Console File Backup and Size Check

own3mall 7 жил өмнө
parent
commit
629de35c64

+ 2 - 2
includes/lib_remote.php

@@ -577,10 +577,10 @@ class OGPRemoteLibrary
 	/// \todo Other return values?
 	// Starts game server
 	public function universal_start($home_id, $game_home, $game_binary, $run_dir, $startup_cmd,
-		$server_port, $server_ip, $cpu, $nice, $preStart, $envVars, $game_key)
+		$server_port, $server_ip, $cpu, $nice, $preStart, $envVars, $game_key, $console_log = "")
 	{
 		$params_array = $this->encrypt_params($home_id, $game_home, $game_binary,
-			$run_dir, $startup_cmd, $server_port, $server_ip, $cpu, $nice, $preStart, $envVars, $game_key);
+			$run_dir, $startup_cmd, $server_port, $server_ip, $cpu, $nice, $preStart, $envVars, $game_key, $console_log);
 		$this->add_enc_chk($params_array);
 		$request = xmlrpc_encode_request("universal_start", $params_array);
 		$response = $this->sendRequest($request);

+ 2 - 1
modules/gamemanager/home_handling_functions.php

@@ -403,7 +403,8 @@ function exec_operation( $action, $home_id, $mod_id, $ip, $port )
 												 $home_info['mods'][$mod_id]['nice'],
 												 $preStart,
 												 $envVars,
-												 $server_xml->game_key
+												 $server_xml->game_key,
+												 (isset( $server_xml->console_log ) ? $server_xml->console_log : "")
 												 );
 		$db->logger(get_lang('server_started') . " (".$home_info['home_name']." $ip:$port)");
 		if( $start_retval == AGENT_ERROR_NOT_EXECUTABLE or $start_retval <= 0)

+ 2 - 1
modules/gamemanager/mini_start.php

@@ -631,7 +631,8 @@ elseif($server_home['home_id'] == $_POST['home_id'])
 		$server_home['nice'],
 		$preStart,
 		$envVars,
-		$server_xml->game_key
+		$server_xml->game_key,
+		(isset( $server_xml->console_log ) ? $server_xml->console_log : "")
 		);
 	$db->logger(  get_lang("server_started")  . " (".$server_home['home_name']." $ip:$port)" );
 	if ( $start_retval == AGENT_ERROR_NOT_EXECUTABLE )

+ 3 - 2
ogp_api.php

@@ -928,7 +928,8 @@ function api_gamemanager()
 												 $home_info['mods'][$mod_id]['nice'],
 												 $preStart,
 												 $envVars,
-												 $server_xml->game_key
+												 $server_xml->game_key,
+												 (isset( $server_xml->console_log ) ? $server_xml->console_log : "")
 												 );
 		
 		if( $start_retval == AGENT_ERROR_NOT_EXECUTABLE)
@@ -1695,4 +1696,4 @@ function api_steam_workshop()
 		
 	return array("status" => $status, "message" => $message);
 }
-?>
+?>