hitsword
/
AMProxy-2.0
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

报错时不重载Nginx 

Signed-off-by: HITSword <admin@huayizhiyun.com>
master
HITSword 2020-01-17 18:50:34 +08:00
parent b49f4bf949
commit 9b0843f21b
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
AMHScript
View File

@ -69,14 +69,20 @@ function amh_module_admin()
;; ;;
add) add)
proxy_pass=$3; proxy_pass=$3;
php ${module_dir}cli.php --action='add' --server_name=${domain} --proxy_pass=${proxy_pass}; RES=`php ${module_dir}cli.php --action='add' --server_name=${domain} --proxy_pass=${proxy_pass}`;
amh nginx reload; echo $RES;
if ! echo "$RES" | grep 'Error' > /dev/null; then
amh nginx reload;
fi;
;; ;;
edit) edit)
ParamName=$3 ParamName=$3
ParamVal=$4 ParamVal=$4
php ${module_dir}cli.php --action='edit' --server_name=${domain} --field_name=${ParamName} --value=${ParamVal}; RES=`php ${module_dir}cli.php --action='edit' --server_name=${domain} --field_name=${ParamName} --value=${ParamVal}`;
amh nginx reload; echo $RES;
if ! echo "$RES" | grep 'Error' > /dev/null; then
amh nginx reload;
fi;
;; ;;
del) del)
echo "del something"; echo "del something";

10
cli.php
View File

@ -93,7 +93,7 @@
function amproxy_add($server_name, $proxy_pass = '') function amproxy_add($server_name, $proxy_pass = '')
{ {
if (empty($server_name)) { if (empty($server_name)) {
return "[ERROR] The server_name is empty.\n";//不能为空 return "[Error] The server_name is empty.\n";//不能为空
} }
$res = ''; $res = '';
@ -124,7 +124,7 @@
$res = "[OK] successfully create $server_name AMProxy.\n"; $res = "[OK] successfully create $server_name AMProxy.\n";
shell_exec("php "._HYPROXY."hyproxy-cli.php --action='make' --server_name=$server_name"); shell_exec("php "._HYPROXY."hyproxy-cli.php --action='make' --server_name=$server_name");
} else { } else {
$res = "[ERROR] error create $server_name AMProxy.\n"; $res = "[Error] error create $server_name AMProxy.\n";
} }
} }
return $res; return $res;
@ -140,10 +140,10 @@
function hyproxy_edit($server_name, $field_name = '', $value = '') function hyproxy_edit($server_name, $field_name = '', $value = '')
{ {
if (empty($server_name)) { if (empty($server_name)) {
return "[ERROR] The server_name is empty.\n";//不能为空 return "[Error] The server_name is empty.\n";//不能为空
} }
if (empty($field_name)) { if (empty($field_name)) {
return "[ERROR] The field_name is empty.\n";//不能为空 return "[Error] The field_name is empty.\n";//不能为空
} }
$value = trim($value); $value = trim($value);
$res = ''; $res = '';
@ -174,7 +174,7 @@
$res = "[OK] $field_name parameters set success.\n"; $res = "[OK] $field_name parameters set success.\n";
shell_exec("php "._HYPROXY."hyproxy-cli.php --action='make' --server_name=$server_name"); shell_exec("php "._HYPROXY."hyproxy-cli.php --action='make' --server_name=$server_name");
} else { } else {
$res = "[ERROR] $field_name parameters set error.\n"; $res = "[Error] $field_name parameters set error.\n";
} }
} }
return $res; return $res;