Browse Source

use function fatal(...)

Cong Ding 12 years ago
parent
commit
dcfd6f1e07
1 changed files with 3 additions and 6 deletions
  1. 3 6
      etcd.go

+ 3 - 6
etcd.go

@@ -203,8 +203,7 @@ func startRaft(securityType int) {
 	raftServer, err = raft.NewServer(raftName, dirPath, raftTransporter, etcdStore, nil)
 	raftServer, err = raft.NewServer(raftName, dirPath, raftTransporter, etcdStore, nil)
 
 
 	if err != nil {
 	if err != nil {
-		fmt.Println(err)
-		os.Exit(1)
+		fatal(fmt.Sprintln(err))
 	}
 	}
 
 
 	// LoadSnapshot
 	// LoadSnapshot
@@ -398,8 +397,7 @@ func startClientTransport(port int, st int) {
 		err := server.ListenAndServeTLS(clientCertFile, clientKeyFile)
 		err := server.ListenAndServeTLS(clientCertFile, clientKeyFile)
 
 
 		if err != nil {
 		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)
 	cert, err := x509.ParseCertificate(block.Bytes)
 
 
 	if err != nil {
 	if err != nil {
-		fmt.Println(err)
-		os.Exit(1)
+		fatal(fmt.Sprintln(err))
 	}
 	}
 
 
 	certPool := x509.NewCertPool()
 	certPool := x509.NewCertPool()