From 74b67ae2d6432ee85781f7cc7d68636d0ba4ace4 Mon Sep 17 00:00:00 2001
From: Umputun <umputun@gmail.com>
Date: Sun, 24 Dec 2017 18:33:51 -0600
Subject: [PATCH] simplify exporter creation

---
 app/main.go        | 1 -
 app/rest/admin.go  | 3 +--
 app/rest/server.go | 4 +---
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/main.go b/app/main.go
index cd10b762..d273b87d 100644
--- a/app/main.go
+++ b/app/main.go
@@ -72,7 +72,6 @@ func main() {
 		SessionStore: sessionStore,
 		Admins:       opts.Admins,
 		DevMode:      opts.DevMode,
-		Exporter:     &migrator.Remark{DataStore: dataStore},
 		AuthGoogle: auth.NewGoogle(auth.Params{
 			Cid:          opts.ServerCommand.GoogleCID,
 			Csecret:      opts.ServerCommand.GoogleCSEC,
diff --git a/app/rest/admin.go b/app/rest/admin.go
index b39671a9..7c2c0a2e 100644
--- a/app/rest/admin.go
+++ b/app/rest/admin.go
@@ -4,11 +4,10 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/umputun/remark/app/migrator"
-
 	"github.com/go-chi/chi"
 	"github.com/go-chi/render"
 
+	"github.com/umputun/remark/app/migrator"
 	"github.com/umputun/remark/app/store"
 )
 
diff --git a/app/rest/server.go b/app/rest/server.go
index 470433aa..87c7c96d 100644
--- a/app/rest/server.go
+++ b/app/rest/server.go
@@ -29,7 +29,6 @@ type Server struct {
 	AuthGoogle   *auth.Provider
 	AuthGithub   *auth.Provider
 	SessionStore *sessions.FilesystemStore
-	Exporter     migrator.Exporter
 	DevMode      bool
 
 	mod admin
@@ -62,9 +61,8 @@ func (s *Server) Run() {
 		})
 
 		rapi.With(Auth(s.SessionStore, s.Admins, s.DevMode)).Group(func(radmin chi.Router) {
-			s.mod = admin{dataStore: s.Store, exporter: s.Exporter}
+			s.mod = admin{dataStore: s.Store, exporter: &migrator.Remark{DataStore: s.Store}}
 			radmin.Mount("/admin", s.mod.routes())
-
 		})
 	})