From 1fea0dc66f83710d4e218ed1de50d36780aac0a8 Mon Sep 17 00:00:00 2001 From: Danny van Kooten Date: Sun, 15 Jul 2018 09:20:07 +0200 Subject: [PATCH] return error from datastore.Close func --- cmd/fathom/main.go | 4 ++-- pkg/datastore/datastore.go | 2 +- pkg/datastore/sqlstore/sqlstore.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/fathom/main.go b/cmd/fathom/main.go index 1e4a22d..aab41d7 100644 --- a/cmd/fathom/main.go +++ b/cmd/fathom/main.go @@ -60,6 +60,6 @@ func before(c *cli.Context) error { } func after(c *cli.Context) error { - app.database.Close() - return nil + err := app.database.Close() + return err } diff --git a/pkg/datastore/datastore.go b/pkg/datastore/datastore.go index 4f85c4e..07cb5e3 100644 --- a/pkg/datastore/datastore.go +++ b/pkg/datastore/datastore.go @@ -51,7 +51,7 @@ type Datastore interface { GetAggregatedReferrerStatsPageviews(time.Time, time.Time) (int, error) // misc - Close() + Close() error } // New instantiates a new datastore from the given configuration struct diff --git a/pkg/datastore/sqlstore/sqlstore.go b/pkg/datastore/sqlstore/sqlstore.go index 95818e5..24e4898 100644 --- a/pkg/datastore/sqlstore/sqlstore.go +++ b/pkg/datastore/sqlstore/sqlstore.go @@ -62,6 +62,6 @@ func (db *sqlstore) Migrate() { } // Closes the db pool -func (db *sqlstore) Close() { - db.DB.Close() +func (db *sqlstore) Close() error { + return db.DB.Close() }