|
|
@@ -71,24 +71,20 @@ func runWebServer() {
|
|
|
log.Fatalf("Error initializing database: %v", err)
|
|
|
}
|
|
|
|
|
|
- var server *web.Server
|
|
|
- server = web.NewServer()
|
|
|
+ server := web.NewServer()
|
|
|
global.SetWebServer(server)
|
|
|
err = server.Start()
|
|
|
if err != nil {
|
|
|
log.Fatalf("Error starting web server: %v", err)
|
|
|
- return
|
|
|
}
|
|
|
|
|
|
- var subServer *sub.Server
|
|
|
sub.SetDistFS(web.EmbeddedDist())
|
|
|
service.RegisterSubLinkProvider(sub.NewLinkProvider())
|
|
|
- subServer = sub.NewServer()
|
|
|
+ subServer := sub.NewServer()
|
|
|
global.SetSubServer(subServer)
|
|
|
err = subServer.Start()
|
|
|
if err != nil {
|
|
|
log.Fatalf("Error starting sub server: %v", err)
|
|
|
- return
|
|
|
}
|
|
|
|
|
|
sigCh := make(chan os.Signal, 8)
|
|
|
@@ -142,7 +138,6 @@ func runWebServer() {
|
|
|
err = server.StartPanelOnly()
|
|
|
if err != nil {
|
|
|
log.Fatalf("Error restarting web server: %v", err)
|
|
|
- return
|
|
|
}
|
|
|
log.Println("Web server restarted successfully.")
|
|
|
|
|
|
@@ -152,7 +147,6 @@ func runWebServer() {
|
|
|
err = subServer.Start()
|
|
|
if err != nil {
|
|
|
log.Fatalf("Error restarting sub server: %v", err)
|
|
|
- return
|
|
|
}
|
|
|
log.Println("Sub server restarted successfully.")
|
|
|
case sys.SIGUSR1:
|
|
|
@@ -360,7 +354,7 @@ func updateSetting(port int, username string, password string, webBasePath strin
|
|
|
if err != nil {
|
|
|
fmt.Println("Failed to set listen IP:", err)
|
|
|
} else {
|
|
|
- fmt.Printf("listen %v set successfully", listenIP)
|
|
|
+ fmt.Printf("listen %v set successfully\n", listenIP)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -579,7 +573,7 @@ func main() {
|
|
|
fmt.Println()
|
|
|
fmt.Println("Commands:")
|
|
|
fmt.Println(" run run web panel")
|
|
|
- fmt.Println(" migrate migrate form other/old x-ui")
|
|
|
+ fmt.Println(" migrate migrate from other/old x-ui")
|
|
|
fmt.Println(" migrate-db SQLite <-> .dump (--dump/--restore) or copy into PostgreSQL (--dsn)")
|
|
|
fmt.Println(" setting set settings")
|
|
|
}
|