fix:fail to set config. check SCF stat before set.

pull/4/head
qkqpttgf 2020-01-20 12:52:22 +08:00 committed by GitHub
parent 3fde6d0083
commit db588f894c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 7 deletions

View File

@ -153,7 +153,7 @@ function get_refresh_token()
$tmp['client_id'] = $_POST['client_id']; $tmp['client_id'] = $_POST['client_id'];
$tmp['client_secret'] = $_POST['client_secret']; $tmp['client_secret'] = $_POST['client_secret'];
} }
$response = setConfig($tmp); $response = json_decode( setConfig($tmp), true )['Response'];
$title = getconstStr('MayinEnv'); $title = getconstStr('MayinEnv');
$html = getconstStr('Wait') . ' 3s<meta http-equiv="refresh" content="3;URL=' . $url . '?install3">'; $html = getconstStr('Wait') . ' 3s<meta http-equiv="refresh" content="3;URL=' . $url . '?install3">';
if (isset($response['Error'])) { if (isset($response['Error'])) {
@ -161,7 +161,7 @@ function get_refresh_token()
' . $response['Error']['Message'] . '<br><br> ' . $response['Error']['Message'] . '<br><br>
function_name:' . $_SERVER['function_name'] . '<br> function_name:' . $_SERVER['function_name'] . '<br>
Region:' . $_SERVER['Region'] . '<br> Region:' . $_SERVER['Region'] . '<br>
namespace:' . $Namespace . '<br> namespace:' . $_SERVER['namespace'] . '<br>
<button onclick="location.href = location.href;">'.getconstStr('Reflesh').'</button>'; <button onclick="location.href = location.href;">'.getconstStr('Reflesh').'</button>';
$title = 'Error'; $title = 'Error';
} }
@ -183,13 +183,19 @@ namespace:' . $Namespace . '<br>
$tmp['SecretKey'] = $SecretKey; $tmp['SecretKey'] = $SecretKey;
} }
echo SetbaseConfig($_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], $SecretId, $SecretKey); echo SetbaseConfig($_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], $SecretId, $SecretKey);
$response = updateEnvironment($tmp, $_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], $SecretId, $SecretKey); $trynum = 0;
while( json_decode(getfunctioninfo($_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], $SecretId, $SecretKey),true)['Response']['Status']!='Active' ) echo '
'.++$trynum;
//sleep(10);
//$stat = json_decode(getfunctioninfo($_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], $SecretId, $SecretKey),true)['Response'];
//echo $stat['Status'].$stat['StatusDesc'];
$response = json_decode( updateEnvironment($tmp, $_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], $SecretId, $SecretKey), true)['Response'];
if (isset($response['Error'])) { if (isset($response['Error'])) {
$html = $response['Error']['Code'] . '<br> $html = $response['Error']['Code'] . '<br>
' . $response['Error']['Message'] . '<br><br> ' . $response['Error']['Message'] . '<br><br>
function_name:' . $_SERVER['function_name'] . '<br> function_name:' . $_SERVER['function_name'] . '<br>
Region:' . $_SERVER['Region'] . '<br> Region:' . $_SERVER['Region'] . '<br>
namespace:' . $Namespace . '<br> namespace:' . $_SERVER['namespace'] . '<br>
<button onclick="location.href = location.href;">'.getconstStr('Reflesh').'</button>'; <button onclick="location.href = location.href;">'.getconstStr('Reflesh').'</button>';
$title = 'Error'; $title = 'Error';
} else { } else {
@ -445,17 +451,20 @@ namespace:' . $namespace . '<br>
} }
$tmp['domain_path'] = $tmparr; $tmp['domain_path'] = $tmparr;
}*/ }*/
$response = setConfig($tmp); $response = json_decode( setConfig($tmp), true )['Response'];
if (isset($response['Error'])) { if (isset($response['Error'])) {
$html = $response['Error']['Code'] . '<br> $html = $response['Error']['Code'] . '<br>
' . $response['Error']['Message'] . '<br><br> ' . $response['Error']['Message'] . '<br><br>
function_name:' . $_SERVER['function_name'] . '<br> function_name:' . $_SERVER['function_name'] . '<br>
Region:' . $_SERVER['Region'] . '<br> Region:' . $_SERVER['Region'] . '<br>
namespace:' . $Namespace . '<br> namespace:' . $_SERVER['namespace'] . '<br>
<button onclick="location.href = location.href;">'.getconstStr('Reflesh').'</button>'; <button onclick="location.href = location.href;">'.getconstStr('Reflesh').'</button>';
$title = 'Error'; $title = 'Error';
} else { } else {
sleep(3); $trynum = 0;
while( json_decode(getfunctioninfo($_SERVER['function_name'], $_SERVER['Region'], $_SERVER['namespace'], $SecretId, $SecretKey),true)['Response']['Status']!='Active' ) echo '
'.++$trynum;
//sleep(3);
$html .= '<script>location.href=location.href</script>'; $html .= '<script>location.href=location.href</script>';
$title = getconstStr('Setup'); $title = getconstStr('Setup');
} }