瀏覽代碼

logging rather than panic

Jonathan Turner 7 年之前
父節點
當前提交
cfcb94f406
共有 1 個文件被更改,包括 4 次插入4 次删除
  1. 4 4
      examples/longRunningClient.go

+ 4 - 4
examples/longRunningClient.go

@@ -36,27 +36,27 @@ const (
 )
 )
 
 
 func main() {
 func main() {
+	l := log.New(os.Stderr, "GOKRB5 Client: ", log.Ldate|log.Ltime|log.Lshortfile)
+
 	//defer profile.Start(profile.TraceProfile).Stop()
 	//defer profile.Start(profile.TraceProfile).Stop()
 	// Load the keytab
 	// Load the keytab
 	kb, _ := hex.DecodeString(testdata.TESTUSER2_KEYTAB)
 	kb, _ := hex.DecodeString(testdata.TESTUSER2_KEYTAB)
 	kt := keytab.New()
 	kt := keytab.New()
 	err := kt.Unmarshal(kb)
 	err := kt.Unmarshal(kb)
 	if err != nil {
 	if err != nil {
-		panic(err)
+		l.Fatalf("could not load client keytab: %v", err)
 	}
 	}
 
 
 	// Load the client krb5 config
 	// Load the client krb5 config
 	conf, err := config.NewConfigFromString(kRB5CONF)
 	conf, err := config.NewConfigFromString(kRB5CONF)
 	if err != nil {
 	if err != nil {
-		panic(err)
+		l.Fatalf("could not load krb5.conf: %v", err)
 	}
 	}
 	addr := os.Getenv("TEST_KDC_ADDR")
 	addr := os.Getenv("TEST_KDC_ADDR")
 	if addr != "" {
 	if addr != "" {
 		conf.Realms[0].KDC = []string{addr + ":88"}
 		conf.Realms[0].KDC = []string{addr + ":88"}
 	}
 	}
 
 
-	l := log.New(os.Stderr, "GOKRB5 Client: ", log.Ldate|log.Ltime|log.Lshortfile)
-
 	// Create the client with the keytab
 	// Create the client with the keytab
 	cl := client.NewClientWithKeytab("testuser2", "TEST.GOKRB5", kt, conf, client.Logger(l), client.DisablePAFXFAST(true))
 	cl := client.NewClientWithKeytab("testuser2", "TEST.GOKRB5", kt, conf, client.Logger(l), client.DisablePAFXFAST(true))