Instrumentation fixups.

commands/add.go

@@ -5,26 +5,26 @@ import (
 	"github.com/ipfs-search/ipfs-search/config"
 	"github.com/ipfs-search/ipfs-search/crawler"
 	"github.com/ipfs-search/ipfs-search/instr"
-
 	"github.com/ipfs-search/ipfs-search/queue/amqp"
 )
 
 // AddHash queues a single IPFS hash for indexing
 func AddHash(ctx context.Context, cfg *config.Config, hash string) error {
 	instFlusher, err := instr.Install("ipfs-search-add")
 	if err != nil {
-		log.Fatal(err)
+		return err
 	}
 	defer instFlusher()
 
-	instrumentation := instr.New()
+	i := instr.New()
 
 	f := amqp.PublisherFactory{
-		AMQPURL: cfg.AMQP.AMQPURL,
-		Queue:   "hashes",
+		AMQPURL:         cfg.AMQP.AMQPURL,
+		Queue:           "hashes",
+		Instrumentation: i,
 	}
 
-	queue, err := f.NewPublisher(ctx, instrumentation)
+	queue, err := f.NewPublisher(ctx)
 	if err != nil {
 		return err
 	}

main.go

@@ -9,7 +9,6 @@ import (
 	"fmt"
 	"github.com/ipfs-search/ipfs-search/commands"
 	"github.com/ipfs-search/ipfs-search/config"
-	"github.com/ipfs-search/ipfs-search/instr"
 	"gopkg.in/urfave/cli.v1"
 	"log"
 	"os"
@@ -67,8 +66,7 @@ func main() {
 		},
 	}
 
-	err = app.Run(os.Args)
-	if err != nil {
+	if err := app.Run(os.Args); err != nil {
 		log.Fatal(err)
 	}
 }