Merge pull request #21 from ccding/dev

use function fatal(...)
This commit is contained in:
Xiang Li 2013-07-16 10:25:44 -07:00
commit 525d1d57be

View File

@ -203,8 +203,7 @@ func startRaft(securityType int) {
raftServer, err = raft.NewServer(raftName, dirPath, raftTransporter, etcdStore, nil)
if err != nil {
fmt.Println(err)
os.Exit(1)
fatal(fmt.Sprintln(err))
}
// LoadSnapshot
@ -398,8 +397,7 @@ func startClientTransport(port int, st int) {
err := server.ListenAndServeTLS(clientCertFile, clientKeyFile)
if err != nil {
log.Fatal(err)
os.Exit(1)
fatal(fmt.Sprintln(err))
}
}
}
@ -522,8 +520,7 @@ func createCertPool(CAFile string) *x509.CertPool {
cert, err := x509.ParseCertificate(block.Bytes)
if err != nil {
fmt.Println(err)
os.Exit(1)
fatal(fmt.Sprintln(err))
}
certPool := x509.NewCertPool()