rewrite code

pingcap · Sep 8, 2018 · 8ba623f · 8ba623f
1 parent ed136b9
commit 8ba623f
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/executor/distsql.go b/executor/distsql.go
@@ -146,15 +146,13 @@ func zone(sctx sessionctx.Context) (string, int64) {
 	if name == "Local" {
 		localOnce.Do(func() {
 			path, err := filepath.EvalSymlinks("/etc/localtime")
-			if err != nil {
-				log.Errorln(err)
-				localStr = "System"
-			}
-			localStr, err = GetTZNameFromFileName(path)
-			if err != nil {
-				log.Errorln(err)
-				localStr = "System"
+			if err == nil {
+				localStr, err = GetTZNameFromFileName(path)
+				if err == nil {
+					return
+				}
 			}
+			localStr = "System"
 		})
 
 		return localStr, int64(offset)