Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-04-16 12:35:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Log the errors in the resolveXrayAPIPort function

Browse source
This commit is contained in:
HamidReza 2026-03-19 00:17:30 +03:30
parent aaabeeb33c
commit d34e95eba7
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
web/job/check_client_ip_job.go
View file

@ -456,8 +456,13 @@ func (j *CheckClientIpJob) disconnectClientTemporarily(inbound *model.Inbound, c
// resolveXrayAPIPort returns the API inbound port from running config, then template config, then default. // resolveXrayAPIPort returns the API inbound port from running config, then template config, then default.
func (j *CheckClientIpJob) resolveXrayAPIPort() int { func (j *CheckClientIpJob) resolveXrayAPIPort() int {
var configErr error
var templateErr error
if port, err := getAPIPortFromConfigPath(xray.GetConfigPath()); err == nil { if port, err := getAPIPortFromConfigPath(xray.GetConfigPath()); err == nil {
return port return port
} else {
configErr = err
} }
db := database.GetDB() db := database.GetDB()
@ -465,9 +470,20 @@ func (j *CheckClientIpJob) resolveXrayAPIPort() int {
if err := db.Where("key = ?", "xrayTemplateConfig").First(&template).Error; err == nil { if err := db.Where("key = ?", "xrayTemplateConfig").First(&template).Error; err == nil {
if port, parseErr := getAPIPortFromConfigData([]byte(template.Value)); parseErr == nil { if port, parseErr := getAPIPortFromConfigData([]byte(template.Value)); parseErr == nil {
return port return port
} else {
templateErr = parseErr
} }
} else {
templateErr = err
} }
logger.Warningf(
"[LIMIT_IP] Could not determine Xray API port from config or template; falling back to default port %d (config error: %v, template error: %v)",
defaultXrayAPIPort,
configErr,
templateErr,
)
return defaultXrayAPIPort return defaultXrayAPIPort
} }