Bumped codex (#93)

Author: kristinapathak

go.mod

@@ -3,7 +3,7 @@ module github.com/Comcast/codex-svalinn
 go 1.12
 
 require (
-	github.com/Comcast/codex v0.6.0
+	github.com/Comcast/codex v0.7.0
 	github.com/Comcast/webpa-common v1.0.1
 	github.com/Comcast/wrp-go v1.0.1-0.20190425181536-16cc54c2efd1
 	github.com/InVisionApp/go-health v2.1.0+incompatible

go.sum

@@ -3,8 +3,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Comcast/codex v0.6.0 h1:SvOCqyiFys6g31TWjMcUioapYtjjg2JI0VZL3Oe6XaQ=
-github.com/Comcast/codex v0.6.0/go.mod h1:0EfKNJTGyayQae7ciafhglQtpGiYD87GaU8nBuLPR1A=
+github.com/Comcast/codex v0.7.0 h1:/N16BJKncmPsECspBJyxH2z3Y4isgdMI3ti0IGofsJM=
+github.com/Comcast/codex v0.7.0/go.mod h1:0EfKNJTGyayQae7ciafhglQtpGiYD87GaU8nBuLPR1A=
 github.com/Comcast/webpa-common v1.0.0 h1:rItnLnh/3nVo+l3+O35pUAeMXaSHNSgyaU7kY6rGBBc=
 github.com/Comcast/webpa-common v1.0.0/go.mod h1:XSu1nN06grod4RD/3WRYdeMMKDXBpeosZgIoNcmYsus=
 github.com/Comcast/webpa-common v1.0.1 h1:HMM8HFgI//umwSiYnCd8MJDGSXUVMqjyfqzYTAbeuUk=

main.go

@@ -24,6 +24,10 @@ import (
 	_ "net/http/pprof"
 	"sync"
 
+	"github.com/Comcast/codex/db/retry"
+
+	"github.com/Comcast/codex/db/postgresql"
+
 	"github.com/Comcast/codex-svalinn/requestParser"
 	"github.com/Comcast/codex/db/batchInserter"
 
@@ -68,7 +72,7 @@ type SvalinnConfig struct {
 	Webhook           WebhookConfig
 	RequestParser     requestParser.Config
 	BatchInserter     batchInserter.Config
-	Db                db.Config
+	Db                postgresql.Config
 	InsertRetries     RetryConfig
 	BlacklistInterval time.Duration
 }
@@ -88,7 +92,7 @@ type Svalinn struct {
 }
 
 type database struct {
-	dbConn             *db.Connection
+	dbClose            func() error
 	blacklistStop      chan struct{}
 	blacklistRefresher blacklist.List
 	inserter           db.Inserter
@@ -105,7 +109,7 @@ func svalinn(arguments []string) {
 
 	var (
 		f, v                                = pflag.NewFlagSet(applicationName, pflag.ContinueOnError), viper.New()
-		logger, metricsRegistry, codex, err = server.Initialize(applicationName, arguments, f, v, secure.Metrics, db.Metrics, requestParser.Metrics, batchInserter.Metrics)
+		logger, metricsRegistry, codex, err = server.Initialize(applicationName, arguments, f, v, secure.Metrics, postgresql.Metrics, dbretry.Metrics, requestParser.Metrics, batchInserter.Metrics)
 	)
 
 	if parseErr, done := printVersion(f, arguments); done {
@@ -201,31 +205,32 @@ func exitIfError(logger log.Logger, err error) {
 
 func setupDb(config *SvalinnConfig, logger log.Logger, metricsRegistry xmetrics.Registry) (database, error) {
 	var (
-		d   database
-		err error
+		d database
 	)
 	d.health = health.New()
 	d.health.Logger = healthlogger.NewHealthLogger(logger)
 
-	d.dbConn, err = db.CreateDbConnection(config.Db, metricsRegistry, d.health)
+	dbConn, err := postgresql.CreateDbConnection(config.Db, metricsRegistry, d.health)
 	if err != nil {
 		return database{}, err
 	}
 
-	d.inserter = db.CreateRetryInsertService(
-		d.dbConn,
-		db.WithRetries(config.InsertRetries.NumRetries),
-		db.WithInterval(config.InsertRetries.Interval),
-		db.WithIntervalMultiplier(config.InsertRetries.IntervalMult),
-		db.WithMeasures(metricsRegistry),
+	d.dbClose = dbConn.Close
+
+	d.inserter = dbretry.CreateRetryInsertService(
+		dbConn,
+		dbretry.WithRetries(config.InsertRetries.NumRetries),
+		dbretry.WithInterval(config.InsertRetries.Interval),
+		dbretry.WithIntervalMultiplier(config.InsertRetries.IntervalMult),
+		dbretry.WithMeasures(metricsRegistry),
 	)
 
 	d.blacklistStop = make(chan struct{}, 1)
 	blacklistConfig := blacklist.RefresherConfig{
 		Logger:         logger,
 		UpdateInterval: config.BlacklistInterval,
 	}
-	d.blacklistRefresher = blacklist.NewListRefresher(blacklistConfig, d.dbConn, d.blacklistStop)
+	d.blacklistRefresher = blacklist.NewListRefresher(blacklistConfig, dbConn, d.blacklistStop)
 	return d, nil
 
 }
@@ -272,7 +277,7 @@ func waitUntilShutdown(logger log.Logger, s *Svalinn, database database) {
 	s.waitGroup.Wait()
 	s.requestParser.Stop()
 	s.batchInserter.Stop()
-	err = database.dbConn.Close()
+	err = database.dbClose()
 	if err != nil {
 		logging.Error(logger, emperror.Context(err)...).Log(logging.MessageKey(), "closing database threads failed",
 			logging.ErrorKey(), err.Error())

release_notes.md

@@ -1 +1,2 @@
-
+- Added deathdate check
+- Bumped codex