From 736b1a8231516f04ae751a7304a3aaf495db32aa Mon Sep 17 00:00:00 2001
From: Xuanwo <xuanwo@yunify.com>
Date: Thu, 20 Feb 2020 23:03:00 +0800
Subject: [PATCH 1/2] utils: Don't Fatal on panic
Signed-off-by: Xuanwo <xuanwo@yunify.com>
---
utils/check.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/utils/check.go b/utils/check.go
index 9939322..38847a9 100644
--- a/utils/check.go
+++ b/utils/check.go
@@ -33,6 +33,6 @@ func CheckClosedDB(err error) {
// Recover will recover a goroutine from panic.
func Recover() {
if x := recover(); x != nil {
- logrus.Fatalf("Caught panic: %v, Trace: %s", x, debug.Stack())
+ logrus.Errorf("Caught panic: %v, Trace: %s", x, debug.Stack())
}
}
From 532ade886bd82321b409953b79a75976c00f3450 Mon Sep 17 00:00:00 2001
From: Xuanwo <xuanwo@yunify.com>
Date: Thu, 20 Feb 2020 23:06:26 +0800
Subject: [PATCH 2/2] dependences: Replace to Xuanwo's fork to fix panic
Signed-off-by: Xuanwo <xuanwo@yunify.com>
---
go.mod | 5 ++++-
go.sum | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/go.mod b/go.mod
index 98d912e..edcd12b 100644
--- a/go.mod
+++ b/go.mod
@@ -30,4 +30,7 @@ require (
gopkg.in/yaml.v2 v2.2.8
)
-replace github.com/qiniu/x => github.com/Xuanwo/qiniu_x v0.0.0-20190416044656-4dd63e731f37
+replace (
+ github.com/colinmarc/hdfs/v2 => github.com/Xuanwo/hdfs/v2 v2.1.2-0.20200220140332-94d2de338735
+ github.com/qiniu/x => github.com/Xuanwo/qiniu_x v0.0.0-20190416044656-4dd63e731f37
+)
diff --git a/go.sum b/go.sum
index c94e0e1..0dca4e9 100644
--- a/go.sum
+++ b/go.sum
@@ -25,6 +25,8 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod h1:1pk82RBxDY/JZnPQrtqHlUFfCctgdorsd9M06fMynOM=
+github.com/Xuanwo/hdfs/v2 v2.1.2-0.20200220140332-94d2de338735 h1:uEJ5/a/i2cErikm/vI4mTJSMawouX9gRxngFh3PZTxQ=
+github.com/Xuanwo/hdfs/v2 v2.1.2-0.20200220140332-94d2de338735/go.mod h1:M3x+k8UKKmxtFu++uAZ0OtDU8jR3jnaZIAc6yK4Ue0c=
github.com/Xuanwo/qiniu_x v0.0.0-20190416044656-4dd63e731f37 h1:b0m92UQVajQb10i2p3UoiZJKuSiVyUhGt5tPxRMMryA=
github.com/Xuanwo/qiniu_x v0.0.0-20190416044656-4dd63e731f37/go.mod h1:q06LeOfHbnXMW4B2OGAuIKAWDAqrWoCzryOWvn2Rji8=
github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20180615125516-36bf7aa2f916 h1:ploQZaRzPbNcTMk4rp4hsBmKgK1k1YLkY1pOjRJMOYk=
@@ -41,8 +43,6 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/colinmarc/hdfs/v2 v2.1.1 h1:x0hw/m+o3UE20Scso/KCkvYNc9Di39TBlCfGMkJ1/a0=
-github.com/colinmarc/hdfs/v2 v2.1.1/go.mod h1:M3x+k8UKKmxtFu++uAZ0OtDU8jR3jnaZIAc6yK4Ue0c=
github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=