bit
/
taskman_atf
26
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor fix

This commit is contained in:
n.pankin 2022-09-23 08:04:25 +03:00
parent 25f30d029e
commit e1ccd6387e
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
atf.inc.php
View File

@ -146,9 +146,9 @@ class ATFSession
function __construct() function __construct()
{ {
$this->guid = atf_guid(); $this->guid = atf_guid();
$this->branch = taskman_prop('GAME_VERSION_BRANCH'); $this->branch = get('GAME_VERSION_BRANCH');
$this->version = taskman_prop('GAME_VERSION'); $this->version = get('GAME_VERSION');
$this->rev_hash = taskman_prop('GAME_REVISION_HASH'); $this->rev_hash = get('GAME_REVISION_HASH');
} }
function incBogusDevice($device) function incBogusDevice($device)
@ -577,7 +577,7 @@ class ATFPlan
if($check_error !== null) if($check_error !== null)
{ {
$this->_ignoreDevice($device, $check_error); $this->_ignoreDevice($device, $check_error);
if (!taskman_prop('EXT_BOT_ERROR_PAUSE')) if (!get('EXT_BOT_ERROR_PAUSE'))
$task->reschedule(); $task->reschedule();
} }
@ -651,7 +651,7 @@ class ATFPlan
atf_slack_post("Last logs: ```$app_log``` *{$task->device}*", array('thread_ts' => $task->slack_thread_ts)); atf_slack_post("Last logs: ```$app_log``` *{$task->device}*", array('thread_ts' => $task->slack_thread_ts));
} }
if (!taskman_prop('EXT_BOT_ERROR_PAUSE')) if (!get('EXT_BOT_ERROR_PAUSE'))
$task->reschedule(); $task->reschedule();
}); });
@ -1169,7 +1169,7 @@ function _atf_get_local_file_crc($path)
if(!is_file($path)) if(!is_file($path))
return ''; return '';
taskman_shell_ensure("crc32 $path", $out); shell("crc32 $path", $out);
return trim($out[0]); return trim($out[0]);
} }
@ -1330,6 +1330,7 @@ function _atf_db()
function atf_stats_send($table, array $data) function atf_stats_send($table, array $data)
{ {
return;
$db = _atf_db(); $db = _atf_db();
$db->insert($table, array(array_values($data)), array_keys($data)); $db->insert($table, array(array_values($data)), array_keys($data));
} }
@ -1522,13 +1523,13 @@ function atf_host()
deploy_declare_node($node_name, deploy_declare_node($node_name,
array( array(
'user' => taskman_prop("ATF_USER"), 'user' => get("ATF_USER"),
'dir' => '', 'dir' => '',
'ssh_key_str' => taskman_prop("ATF_KEY"), 'ssh_key_str' => get("ATF_KEY"),
'hosts' => array(taskman_prop("ATF_HOST")), 'hosts' => array(get("ATF_HOST")),
'adb' => taskman_prop("ATF_HOST_ADB"), 'adb' => get("ATF_HOST_ADB"),
'package_id' => taskman_prop("PACKAGE_ID"), 'package_id' => get("PACKAGE_ID"),
'activity' => taskman_prop("LAUNCHER_ACTIVITY") 'activity' => get("LAUNCHER_ACTIVITY")
) )
); );