Merge pull request #4 from muhammadn/cleanups

Cleanups

Author: jozef-slezak

.gitignore

@@ -1,6 +1,3 @@
-cmd/jaeger-pg-store/jaeger-pg-*
-jaeger-pg-store
-
 # Binaries for programs and plugins
 *.exe
 *.exe~
@@ -15,4 +12,4 @@ jaeger-pg-store
 *.out
 
 # Dependency directories (remove the comment below to include it)
-# vendor/
+# vendor/

cmd/jaeger-pg-store/main.go

@@ -0,0 +1,32 @@
+package main
+
+import (
+        "os"
+ 
+	"github.com/hashicorp/go-hclog"
+	"jaeger-postgresql/pgstore"
+	"github.com/jaegertracing/jaeger/plugin/storage/grpc"
+	"github.com/jaegertracing/jaeger/plugin/storage/grpc/shared"
+)
+
+func main() {
+	logger := hclog.New(&hclog.LoggerOptions{
+		Name:  "jaeger-postgresql",
+		Level: hclog.Warn, // Jaeger only captures >= Warn, so don't bother logging below Warn
+	})
+
+	var store shared.StoragePlugin
+	var closeStore func() error
+	var err error
+
+	conf := pgstore.Configuration{}
+
+	store, closeStore, err = pgstore.NewStore(&conf, logger)
+
+	grpc.Serve(store)
+
+	if err = closeStore(); err != nil {
+		logger.Error("failed to close store", "error", err)
+		os.Exit(1)
+	}
+}

go.mod

@@ -1,15 +1,16 @@
-module github.com/innovatrics/jaeger-postgresql
+module jaeger-postgresql
 
 go 1.12
 
 require (
+	github.com/go-pg/pg/v9 v9.2.0
+	github.com/go-pg/urlstruct v0.2.8 // indirect
 	github.com/gogo/googleapis v1.2.0 // indirect
 	github.com/hashicorp/go-hclog v0.9.0
 	github.com/jaegertracing/jaeger v1.17.1
+	github.com/lib/pq v1.3.0
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.1 // indirect
 	github.com/pkg/errors v0.9.1
 	github.com/spf13/viper v1.6.2
-	github.com/lib/pq v1.3.0
-	github.com/go-pg/pg v0.0.0-20200411070146-66252e11b106
 )