mirror of
https://github.com/v2rayA/v2rayA.git
synced 2026-11-20 23:02:25 +03:00
chore: add log markers for fatal
This commit is contained in:
1 parent
df6bc7ff01
commit
82e4004ef3
5 files changed
+14
-14
No files matched your search
@@ -33,7 +33,7 @@ func (u *ReservedIpPool) Lookup(domain string) [4]byte {
|
||||
d := out.(string)
|
||||
ip, ok := u.m[d]
|
||||
if !ok {
|
||||
log.Fatal("cannot find the ip of deleting domain:", d)
|
||||
log.Fatal("cannot find the ip of deleting domain: %v", d)
|
||||
}
|
||||
u.m[domain] = ip
|
||||
delete(u.m, d)
|
||||
|
||||
@@ -378,7 +378,7 @@ func (t *Template) setDNS(outbounds []serverInfo, supportUDP map[string]bool) (r
|
||||
for _, r := range routing {
|
||||
b, err := jsoniter.Marshal(r)
|
||||
if err != nil {
|
||||
log.Fatal("%v", err)
|
||||
return nil, fmt.Errorf("jsoniter.Marshal: %v", err)
|
||||
}
|
||||
strRouting = append(strRouting, string(b))
|
||||
}
|
||||
@@ -387,7 +387,7 @@ func (t *Template) setDNS(outbounds []serverInfo, supportUDP map[string]bool) (r
|
||||
for _, sr := range strRouting {
|
||||
var r coreObj.RoutingRule
|
||||
if err := jsoniter.Unmarshal([]byte(sr), &r); err != nil {
|
||||
log.Fatal("%v: %v", err, sr)
|
||||
return nil, fmt.Errorf("jsoniter.Unmarshal: RoutingRule: %v", err)
|
||||
}
|
||||
routing = append(routing, r)
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@ import (
|
||||
"github.com/boltdb/bolt"
|
||||
"github.com/v2rayA/v2rayA/conf"
|
||||
"github.com/v2rayA/v2rayA/pkg/util/copyfile"
|
||||
"log"
|
||||
"github.com/v2rayA/v2rayA/pkg/util/log"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"sync"
|
||||
@@ -38,7 +38,7 @@ func initDB() {
|
||||
var err error
|
||||
db, err = bolt.Open(dbPath, 0600, nil)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
log.Fatal("bolt.Open: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+4
-4
@@ -60,7 +60,7 @@ func checkEnvironment() {
|
||||
}
|
||||
if occupied, sockets, err := ports.IsPortOccupied([]string{v2rayAListeningPort + ":tcp"}); occupied {
|
||||
if err != nil {
|
||||
log.Fatal("netstat:", err)
|
||||
log.Fatal("netstat: %v", err)
|
||||
}
|
||||
for _, socket := range sockets {
|
||||
process, err := socket.Process()
|
||||
@@ -214,7 +214,7 @@ func initConfigure() {
|
||||
log.Alert("downloading missing geoip.dat and geosite.dat")
|
||||
var l net.Listener
|
||||
if l, err = net.Listen("tcp", conf.GetEnvironmentConfig().Address); err != nil {
|
||||
log.Fatal("%v", err)
|
||||
log.Fatal("net.Listen: %v", err)
|
||||
}
|
||||
e := gin.New()
|
||||
e.GET("/", func(c *gin.Context) {
|
||||
@@ -227,13 +227,13 @@ func initConfigure() {
|
||||
if !asset.DoesV2rayAssetExist("geoip.dat") {
|
||||
err := dat.UpdateLocalGeoIP()
|
||||
if err != nil {
|
||||
log.Fatal("%v", err)
|
||||
log.Fatal("UpdateLocalGeoIP: %v", err)
|
||||
}
|
||||
}
|
||||
if !asset.DoesV2rayAssetExist("geosite.dat") {
|
||||
err = dat.UpdateLocalGeoSite()
|
||||
if err != nil {
|
||||
log.Fatal("%v", err)
|
||||
log.Fatal("UpdateLocalGeoSite: %v", err)
|
||||
}
|
||||
}
|
||||
if l != nil {
|
||||
|
||||
@@ -62,7 +62,7 @@ func ServeGUI(r *gin.Engine) {
|
||||
if webDir == "" {
|
||||
webFS, err := fs.Sub(webRoot, "web")
|
||||
if err != nil {
|
||||
log.Fatal("%v", err)
|
||||
log.Fatal("fs.Sub: %v", err)
|
||||
}
|
||||
ss := http.StripPrefix("/static", statigz.FileServer(webFS.(fs.ReadDirFS)))
|
||||
r.GET("/static/*w", func(c *gin.Context) {
|
||||
@@ -70,12 +70,12 @@ func ServeGUI(r *gin.Engine) {
|
||||
})
|
||||
f, err := webFS.Open("index.html")
|
||||
if err != nil {
|
||||
log.Fatal("%v", err)
|
||||
log.Fatal("webFS.Open index.html:", err)
|
||||
}
|
||||
defer f.Close()
|
||||
html, err := io.ReadAll(f)
|
||||
if err != nil {
|
||||
log.Fatal("%v", err)
|
||||
log.Fatal("ReadAll index.html: %v", err)
|
||||
}
|
||||
r.GET("/", cachedHTML(html))
|
||||
} else {
|
||||
@@ -96,12 +96,12 @@ func ServeGUI(r *gin.Engine) {
|
||||
|
||||
f, err := os.Open(path.Join(webDir, "index.html"))
|
||||
if err != nil {
|
||||
log.Fatal("%v", err)
|
||||
log.Fatal("Open index.html: %v", err)
|
||||
}
|
||||
defer f.Close()
|
||||
html, err := io.ReadAll(f)
|
||||
if err != nil {
|
||||
log.Fatal("%v", err)
|
||||
log.Fatal("ReadAll index.html: %v", err)
|
||||
}
|
||||
r.GET("/", cachedHTML(html))
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user