From 694fea3943dc0bab80496c5a64364ae15ffb8e8a Mon Sep 17 00:00:00 2001 From: David Christofas Date: Tue, 4 Feb 2020 12:05:17 +0100 Subject: [PATCH] clean up and add a changelog snippet --- changelog/unreleased/22 | 5 +++++ go.mod | 1 - go.sum | 1 + log/log.go | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 changelog/unreleased/22 diff --git a/changelog/unreleased/22 b/changelog/unreleased/22 new file mode 100644 index 0000000000..75b57db32e --- /dev/null +++ b/changelog/unreleased/22 @@ -0,0 +1,5 @@ +Change: upgrade the micro libraries + +Upgraded the go-micro libraries to v2. + +https://github.com/owncloud/ocis-pkg/pull/22 diff --git a/go.mod b/go.mod index 515a22b2fc..f29935e4d4 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,6 @@ require ( github.com/justinas/alice v1.2.0 github.com/micro/cli/v2 v2.1.1 github.com/micro/go-micro/v2 v2.0.0 - github.com/micro/go-plugins v1.5.1 github.com/micro/go-plugins/wrapper/trace/opencensus/v2 v2.0.1 github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect github.com/prometheus/client_golang v1.2.1 diff --git a/go.sum b/go.sum index 346016075f..6e256a3ca2 100644 --- a/go.sum +++ b/go.sum @@ -237,6 +237,7 @@ github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6 github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d h1:3PaI8p3seN09VjbTYC/QWlUZdZ1qS1zGjy7LH2Wt07I= github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= diff --git a/log/log.go b/log/log.go index d9c010d441..8715fc6064 100644 --- a/log/log.go +++ b/log/log.go @@ -73,7 +73,7 @@ func NewLogger(opts ...Option) Logger { mlog.SetLogger( microZerolog{ logger: logger, - buffer: ring.New(1024), // TODO make configurable? + buffer: ring.New(mdlog.DefaultSize), }, )