lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-10-23 01:14:08 -04:00
Code Issues Releases Wiki Activity

Remove use of panic

Browse Source
This commit is contained in:
V2Ray
2015-10-07 10:05:11 +02:00
parent 4f166ccb2c
commit a743f7b46b
3 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
release/server/main.go
View File

@@ -17,7 +17,7 @@ import (
var (
configFile = flag.String("config", "", "Config file for this Point server.")
logLevel = flag.String("loglevel", "", "Level of log info to be printed to console, available value: debug, info, warning, error")
logLevel = flag.String("loglevel", "warning", "Level of log info to be printed to console, available value: debug, info, warning, error")
version = flag.Bool("version", false, "Show current version of V2Ray.")
)
@@ -40,24 +40,31 @@ func main() {
log.SetLogLevel(log.WarningLevel)
case "error":
log.SetLogLevel(log.ErrorLevel)
default:
fmt.Println("Unknown log level: " + *logLevel)
return
}
if configFile == nil || len(*configFile) == 0 {
panic(log.Error("Config file is not set."))
log.Error("Config file is not set.")
return
}
config, err := jsonconf.LoadConfig(*configFile)
if err != nil {
panic(log.Error("Failed to read config file (%s): %v", *configFile, err))
log.Error("Failed to read config file (%s): %v", *configFile, err)
return
}
vPoint, err := core.NewPoint(config)
if err != nil {
panic(log.Error("Failed to create Point server: %v", err))
log.Error("Failed to create Point server: %v", err)
return
}
err = vPoint.Start()
if err != nil {
log.Error("Error starting Point server: %v", err)
return
}
finish := make(chan bool)