Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-06-08 14:14:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix

Browse source 
add base path to importDB API call
This commit is contained in:
MHSanaei 2026-05-10 22:46:39 +02:00
parent b576fe9d61
commit 06f111f3c9
No known key found for this signature in database
GPG key ID: 7E4060F2FBE5AB7A
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
web/controller/server.go
View file

@ -343,10 +343,6 @@ func (a *ServerController) importDB(c *gin.Context) {
return return
} }
defer file.Close() defer file.Close()
// Always restart Xray before return
defer a.serverService.RestartXrayService()
// lastGetStatusTime removed; no longer needed
// Import it
err = a.serverService.ImportDB(file) err = a.serverService.ImportDB(file)
if err != nil { if err != nil {
jsonMsg(c, I18nWeb(c, "pages.index.importDatabaseError"), err) jsonMsg(c, I18nWeb(c, "pages.index.importDatabaseError"), err)

12
web/service/server.go
View file

@ -976,12 +976,18 @@ func (s *ServerService) ImportDB(file multipart.File) error {
return common.NewErrorf("Invalid or corrupt db file: %v", err) return common.NewErrorf("Invalid or corrupt db file: %v", err)
} }
// Stop Xray (ignore error but log) xrayStopped := true
defer func() {
if xrayStopped {
if errR := s.RestartXrayService(); errR != nil {
logger.Warningf("Failed to restart Xray after DB import error: %v", errR)
}
}
}()
if errStop := s.StopXrayService(); errStop != nil { if errStop := s.StopXrayService(); errStop != nil {
logger.Warningf("Failed to stop Xray before DB import: %v", errStop) logger.Warningf("Failed to stop Xray before DB import: %v", errStop)
} }
// Close existing DB to release file locks (especially on Windows)
if errClose := database.CloseDB(); errClose != nil { if errClose := database.CloseDB(); errClose != nil {
logger.Warningf("Failed to close existing DB before replacement: %v", errClose) logger.Warningf("Failed to close existing DB before replacement: %v", errClose)
} }
@ -1029,7 +1035,7 @@ func (s *ServerService) ImportDB(file multipart.File) error {
s.inboundService.MigrateDB() s.inboundService.MigrateDB()
// Start Xray xrayStopped = false
if err = s.RestartXrayService(); err != nil { if err = s.RestartXrayService(); err != nil {
return common.NewErrorf("Imported DB but failed to start Xray: %v", err) return common.NewErrorf("Imported DB but failed to start Xray: %v", err)
} }