kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #2367 from dotcloud/remove_useless_exit

Browse source 
Remove useless os.Exit() after log.Fatalf
This commit is contained in:
Michael Crosby 2013-10-24 09:18:45 -07:00
commit 489c370fcc
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docker/docker.go
View file

@ -71,12 +71,10 @@ func main() {
} }
if err := daemon(*pidfile, *flGraphPath, flHosts, *flAutoRestart, *flEnableCors, *flDns); err != nil { if err := daemon(*pidfile, *flGraphPath, flHosts, *flAutoRestart, *flEnableCors, *flDns); err != nil {
log.Fatal(err) log.Fatal(err)
os.Exit(-1)
} }
} else { } else {
if len(flHosts) > 1 { if len(flHosts) > 1 {
log.Fatal("Please specify only one -H") log.Fatal("Please specify only one -H")
return
} }
protoAddrParts := strings.SplitN(flHosts[0], "://", 2) protoAddrParts := strings.SplitN(flHosts[0], "://", 2)
if err := docker.ParseCommands(protoAddrParts[0], protoAddrParts[1], flag.Args()...); err != nil { if err := docker.ParseCommands(protoAddrParts[0], protoAddrParts[1], flag.Args()...); err != nil {
@ -84,7 +82,6 @@ func main() {
os.Exit(sterr.Status) os.Exit(sterr.Status)
} }
log.Fatal(err) log.Fatal(err)
os.Exit(-1)
} }
} }
} }
@ -153,7 +150,6 @@ func daemon(pidfile string, flGraphPath string, protoAddrs []string, autoRestart
} }
} else { } else {
log.Fatal("Invalid protocol format.") log.Fatal("Invalid protocol format.")
os.Exit(-1)
} }
go func() { go func() {
chErrors <- docker.ListenAndServe(protoAddrParts[0], protoAddrParts[1], server, true) chErrors <- docker.ListenAndServe(protoAddrParts[0], protoAddrParts[1], server, true)