Merge pull request #103 from orbs-network/upgrade/scribe

upgrade scribe to v0.2.3
orbs-network · Nov 20, 2019 · 0ddef9e · 0ddef9e
2 parents c08155e + 8c0687b
commit 0ddef9e
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -10,3 +10,12 @@
 [submodule "vendor/github.com/orbs-network/scribe"]
 	path = vendor/github.com/orbs-network/scribe
 	url = https://github.com/orbs-network/scribe
+[submodule "vendor/github.com/go-playground/ansi"]
+	path = vendor/github.com/go-playground/ansi
+	url = https://github.com/go-playground/ansi
+[submodule "vendor/github.com/orbs-network/gojay"]
+	path = vendor/github.com/orbs-network/gojay
+	url = https://github.com/orbs-network/gojay
+[submodule "vendor/github.com/pkg/errors"]
+	path = vendor/github.com/pkg/errors
+	url = https://github.com/pkg/errors
diff --git a/.version b/.version
@@ -1 +1 @@
-v0.20.0
+v0.21.0
diff --git a/boyar/config/get_logger.go b/boyar/config/get_logger.go
@@ -38,8 +38,7 @@ func GetLogger(flags *Flags) (log.Logger, error) {
 
 	logger := log.GetLogger().
 		WithTags(tags...).
-		WithOutput(outputs...).
-		WithSourcePrefix("boyarin/")
+		WithOutput(outputs...)
 
 	cfg, _ := NewStringConfigurationSource("{}", "")
 	cfg.SetKeyConfigPath(flags.KeyPairConfigPath)

diff --git a/test/helpers/metrics.go b/test/helpers/metrics.go
@@ -52,7 +52,13 @@ func getMetricsForEndpoint(getEndpoint func() string) func() (map[string]interfa
 	}
 }
 
-func GetBlockHeight(getMetrics func() (map[string]interface{}, error)) (int, error) {
+func GetBlockHeight(getMetrics func() (map[string]interface{}, error)) (value int, err error) {
+	defer func() {
+		if e := recover(); e != nil {
+			value = 0
+			err = e.(error)
+		}
+	}()
 	metrics, err := getMetrics()
 	if err != nil {
 		return 0, err

diff --git a/vendor/github.com/go-playground/ansi b/vendor/github.com/go-playground/ansi
diff --git a/vendor/github.com/orbs-network/gojay b/vendor/github.com/orbs-network/gojay
diff --git a/vendor/github.com/orbs-network/scribe b/vendor/github.com/orbs-network/scribe
diff --git a/vendor/github.com/pkg/errors b/vendor/github.com/pkg/errors
+22 −0		.circleci/config.yml
+0 −21		.gitmodules
+7 −0		README.md
+0 −3		git-submodule-checkout.sh
+12 −0		go.mod
+17 −0		go.sum
+5 −2		log/basic_output.go
+14 −8		log/bulk_output.go
+34 −0		log/bulk_output_test.go
+75 −15		log/formatters.go
+69 −0		log/formatters_test.go
+43 −41		log/logger.go
+59 −11		log/logger_test.go
+1 −1		log/output.go
+8 −3		log/t.go
+24 −2		log/test_output.go
+65 −6		log/test_output_test.go
+30 −16		log/truncating_file_writer.go
+117 −17		log/truncating_file_writer_test.go
+0 −1		vendor/github.com/go-playground/ansi
+0 −1		vendor/github.com/google/go-cmp
+0 −1		vendor/github.com/kr/pretty
+0 −1		vendor/github.com/kr/text
+0 −1		vendor/github.com/orbs-network/go-mock
+0 −1		vendor/github.com/pkg/errors
+0 −1		vendor/github.com/stretchr/testify