Merge branch 'master' into v1.x

wework · Dec 12, 2019 · 9263b1b · 9263b1b
2 parents 112137c + 7d2220c
commit 9263b1b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/docs/LOGGING.md b/docs/LOGGING.md
@@ -54,7 +54,15 @@ func SomeHandler(invocation gbus.Invocation, message *gbus.BusMessage) error{
   }
 ```
 grabbit makes it easier handling these cases and reduce the repetitive task of logging
+<<<<<<< HEAD
+<<<<<<< HEAD
 these custom contextual attributes in cases of errors by integrating the [emperror errors package](https://github.com/emperror/errors).
+=======
+these custom contextual attributes in cases of errors by integrating the [emperror errors package] (https://github.com/emperror/errors).
+>>>>>>> Fix logging and added logging documentation (#176)
+=======
+these custom contextual attributes in cases of errors by integrating the [emperror errors package](https://github.com/emperror/errors).
+>>>>>>> added documentation on serialization support (#177)
 emperror drop-in replacement for the default errors package allows developers to add the needed contextual data on the error instance and have graabit log the error with all contextual attribute.
 
 ```go

diff --git a/examples/vacation_app/cmd/flights.go b/examples/vacation_app/cmd/flights.go
@@ -6,6 +6,7 @@ import (
 	"os"
 	"vacation_app/messages"
 	"vacation_app/trace"
+
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/wework/grabbit/gbus"