Skip to content

Commit

Permalink
fix: don't exit in init on error
Browse files Browse the repository at this point in the history
  • Loading branch information
Mythologyli committed Oct 25, 2023
1 parent 4b9699e commit ceac623
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions init.go
Original file line number Diff line number Diff line change
Expand Up @@ -205,14 +205,14 @@ func init() {

if showVersion {
fmt.Printf("ZJU Connect v%s\n", zjuConnectVersion)
return
os.Exit(0)
}

if configFile != "" {
err := parseTOMLConfig(configFile, &conf)
if err != nil {
fmt.Println(err)
return
os.Exit(1)
}
} else {
if tcpPortForwarding != "" {
Expand All @@ -221,7 +221,7 @@ func init() {
addressStringList := strings.Split(forwardingString, "-")
if len(addressStringList) != 2 {
fmt.Println("ZJU Connect: wrong tcp port forwarding format")
return
os.Exit(1)
}

conf.PortForwardingList = append(conf.PortForwardingList, SinglePortForwarding{
Expand All @@ -238,7 +238,7 @@ func init() {
addressStringList := strings.Split(forwardingString, "-")
if len(addressStringList) != 2 {
fmt.Println("ZJU Connect: wrong udp port forwarding format")
return
os.Exit(1)
}

conf.PortForwardingList = append(conf.PortForwardingList, SinglePortForwarding{
Expand All @@ -255,7 +255,7 @@ func init() {
dnsStringSplit := strings.Split(dnsString, ":")
if len(dnsStringSplit) != 2 {
fmt.Println("ZJU Connect: wrong custom dns format")
return
os.Exit(1)
}

conf.CustomDNSList = append(conf.CustomDNSList, SingleCustomDNS{
Expand All @@ -273,6 +273,6 @@ func init() {
fmt.Println("\nFull usage:")
flag.PrintDefaults()

return
os.Exit(1)
}
}

0 comments on commit ceac623

Please sign in to comment.