Merge branch 'master' into v1.x

Author: Guy Baron

examples/vacation_app/cmd/client.go

@@ -57,7 +57,6 @@ func HandleBookingComplete(invocation gbus.Invocation, message *gbus.BusMessage)
 	bookingComplete := message.Payload.(*messages.BookingComplete)
 	if bookingComplete.Success {
 		fmt.Printf("booking completed successfully\n")
-
 	} else {
 		fmt.Printf("failed to book vacation\n")
 	}

examples/vacation_app/cmd/flights.go

@@ -4,14 +4,15 @@ import (
 	"bufio"
 	"fmt"
 	"os"
+  
 	"vacation_app/messages"
 	"vacation_app/trace"
-
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/wework/grabbit/gbus"
 )
 
+
 var runFlightsgServiceCmd = &cobra.Command{
 	Use:   "flights",
 	Short: "Run the flights service",
@@ -28,6 +29,7 @@ var runFlightsgServiceCmd = &cobra.Command{
 		gb := createBus(svcName)
 
 		gb.HandleMessage(messages.BookFlightsCmd{}, HandleBookFlightCommand)
+
 		gb.HandleMessage(messages.CancelFlightsCmd{}, HandleCancelFlightCommand)
 
 		gb.Start()