Compare commits

..

No commits in common. "cac00224db7b229efac3ee242a5d5790ee0d98cf" and "0bde51b91ea505e38569ae3cbe575695abd2db60" have entirely different histories.

10 changed files with 15 additions and 37 deletions

View file

@ -7,7 +7,7 @@ on:
jobs: jobs:
build: build:
runs-on: ubuntu-22.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4

View file

@ -18,7 +18,7 @@ jobs:
- 386 - 386
- armv5 - armv5
- s390x - s390x
runs-on: ubuntu-22.04 runs-on: ubuntu-20.04
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v4

View file

@ -244,7 +244,7 @@ location /sub {
## SO Recomendados ## SO Recomendados
- Ubuntu 22.04+ - Ubuntu 20.04+
- Debian 11+ - Debian 11+
- CentOS 8+ - CentOS 8+
- OpenEuler 22.03+ - OpenEuler 22.03+
@ -258,7 +258,6 @@ location /sub {
- Oracle Linux 8+ - Oracle Linux 8+
- OpenSUSE Tubleweed - OpenSUSE Tubleweed
- Amazon Linux 2023 - Amazon Linux 2023
- Virtuozzo Linux 8+
- Windows x64 - Windows x64
## Arquitecturas y Dispositivos Compatibles ## Arquitecturas y Dispositivos Compatibles

View file

@ -245,7 +245,7 @@ location /sub {
## سیستم‌عامل‌های توصیه شده ## سیستم‌عامل‌های توصیه شده
- Ubuntu 22.04+ - Ubuntu 20.04+
- Debian 11+ - Debian 11+
- CentOS 8+ - CentOS 8+
- OpenEuler 22.03+ - OpenEuler 22.03+
@ -259,7 +259,6 @@ location /sub {
- Oracle Linux 8+ - Oracle Linux 8+
- OpenSUSE Tubleweed - OpenSUSE Tubleweed
- Amazon Linux 2023 - Amazon Linux 2023
- Virtuozzo Linux 8+
- Windows x64 - Windows x64
## معماری‌ها و دستگاه‌های پشتیبانی شده ## معماری‌ها و دستگاه‌های پشتیبانی شده

View file

@ -249,7 +249,7 @@ location /sub {
## Recommended OS ## Recommended OS
- Ubuntu 22.04+ - Ubuntu 20.04+
- Debian 11+ - Debian 11+
- CentOS 8+ - CentOS 8+
- OpenEuler 22.03+ - OpenEuler 22.03+
@ -263,7 +263,6 @@ location /sub {
- Oracle Linux 8+ - Oracle Linux 8+
- OpenSUSE Tubleweed - OpenSUSE Tubleweed
- Amazon Linux 2023 - Amazon Linux 2023
- Virtuozzo Linux 8+
- Windows x64 - Windows x64
## Supported Architectures and Devices ## Supported Architectures and Devices

View file

@ -248,7 +248,7 @@ location /sub {
## Рекомендуемые ОС ## Рекомендуемые ОС
- Ubuntu 22.04+ - Ubuntu 20.04+
- Debian 11+ - Debian 11+
- CentOS 8+ - CentOS 8+
- OpenEuler 22.03+ - OpenEuler 22.03+
@ -262,7 +262,6 @@ location /sub {
- Oracle Linux 8+ - Oracle Linux 8+
- OpenSUSE Tubleweed - OpenSUSE Tubleweed
- Amazon Linux 2023 - Amazon Linux 2023
- Virtuozzo Linux 8+
- Windows x64 - Windows x64
## Поддерживаемые архитектуры и устройства ## Поддерживаемые архитектуры и устройства

View file

@ -245,7 +245,7 @@ location /sub {
## 建议使用的操作系统 ## 建议使用的操作系统
- Ubuntu 22.04+ - Ubuntu 20.04+
- Debian 11+ - Debian 11+
- CentOS 8+ - CentOS 8+
- OpenEuler 22.03+ - OpenEuler 22.03+
@ -259,7 +259,6 @@ location /sub {
- Oracle Linux 8+ - Oracle Linux 8+
- OpenSUSE Tubleweed - OpenSUSE Tubleweed
- Amazon Linux 2023 - Amazon Linux 2023
- Virtuozzo Linux 8+
- Windows x64 - Windows x64
## 支持的架构和设备 ## 支持的架构和设备

View file

@ -63,8 +63,8 @@ elif [[ "${release}" == "centos" ]]; then
echo -e "${red} Please use CentOS 8 or higher ${plain}\n" && exit 1 echo -e "${red} Please use CentOS 8 or higher ${plain}\n" && exit 1
fi fi
elif [[ "${release}" == "ubuntu" ]]; then elif [[ "${release}" == "ubuntu" ]]; then
if [[ ${os_version} -lt 2204 ]]; then if [[ ${os_version} -lt 2004 ]]; then
echo -e "${red} Please use Ubuntu 22 or higher version!${plain}\n" && exit 1 echo -e "${red} Please use Ubuntu 20 or higher version!${plain}\n" && exit 1
fi fi
elif [[ "${release}" == "fedora" ]]; then elif [[ "${release}" == "fedora" ]]; then
if [[ ${os_version} -lt 36 ]]; then if [[ ${os_version} -lt 36 ]]; then
@ -97,7 +97,7 @@ elif [[ "${release}" == "virtuozzo" ]]; then
else else
echo -e "${red}Your operating system is not supported by this script.${plain}\n" echo -e "${red}Your operating system is not supported by this script.${plain}\n"
echo "Please ensure you are using one of the following supported operating systems:" echo "Please ensure you are using one of the following supported operating systems:"
echo "- Ubuntu 22.04+" echo "- Ubuntu 20.04+"
echo "- Debian 11+" echo "- Debian 11+"
echo "- CentOS 8+" echo "- CentOS 8+"
echo "- OpenEuler 22.03+" echo "- OpenEuler 22.03+"

View file

@ -60,8 +60,8 @@ elif [[ "${release}" == "centos" ]]; then
echo -e "${red} Please use CentOS 8 or higher ${plain}\n" && exit 1 echo -e "${red} Please use CentOS 8 or higher ${plain}\n" && exit 1
fi fi
elif [[ "${release}" == "ubuntu" ]]; then elif [[ "${release}" == "ubuntu" ]]; then
if [[ ${os_version} -lt 2204 ]]; then if [[ ${os_version} -lt 2004 ]]; then
echo -e "${red} Please use Ubuntu 22 or higher version!${plain}\n" && exit 1 echo -e "${red} Please use Ubuntu 20 or higher version!${plain}\n" && exit 1
fi fi
elif [[ "${release}" == "fedora" ]]; then elif [[ "${release}" == "fedora" ]]; then
if [[ ${os_version} -lt 36 ]]; then if [[ ${os_version} -lt 36 ]]; then
@ -94,7 +94,7 @@ elif [[ "${release}" == "virtuozzo" ]]; then
else else
echo -e "${red}Your operating system is not supported by this script.${plain}\n" echo -e "${red}Your operating system is not supported by this script.${plain}\n"
echo "Please ensure you are using one of the following supported operating systems:" echo "Please ensure you are using one of the following supported operating systems:"
echo "- Ubuntu 22.04+" echo "- Ubuntu 20.04+"
echo "- Debian 11+" echo "- Debian 11+"
echo "- CentOS 8+" echo "- CentOS 8+"
echo "- OpenEuler 22.03+" echo "- OpenEuler 22.03+"

View file

@ -41,16 +41,8 @@ func (lw *LogWriter) Write(m []byte) (n int, err error) {
if len(matches) > 3 { if len(matches) > 3 {
level := matches[2] level := matches[2]
msgBody := matches[3] msgBody := matches[3]
msgBodyLower := strings.ToLower(msgBody)
if strings.Contains(msgBodyLower, "tls handshake error") || if strings.Contains(strings.ToLower(msgBody), "failed") {
strings.Contains(msgBodyLower, "connection ends") {
logger.Debug("XRAY: " + msgBody)
lw.lastLine = ""
continue
}
if strings.Contains(msgBodyLower, "failed") {
logger.Error("XRAY: " + msgBody) logger.Error("XRAY: " + msgBody)
} else { } else {
switch level { switch level {
@ -68,16 +60,7 @@ func (lw *LogWriter) Write(m []byte) (n int, err error) {
} }
lw.lastLine = "" lw.lastLine = ""
} else if msg != "" { } else if msg != "" {
msgLower := strings.ToLower(msg) if strings.Contains(strings.ToLower(msg), "failed") {
if strings.Contains(msgLower, "tls handshake error") ||
strings.Contains(msgLower, "connection ends") {
logger.Debug("XRAY: " + msg)
lw.lastLine = msg
continue
}
if strings.Contains(msgLower, "failed") {
logger.Error("XRAY: " + msg) logger.Error("XRAY: " + msg)
} else { } else {
logger.Debug("XRAY: " + msg) logger.Debug("XRAY: " + msg)