migrate to multiple sqlite db files ( primary + requests + logs )

scnserver/logic/appcontext.go

@@ -83,7 +83,7 @@ func (ac *AppContext) FinishSuccess(res ginresp.HTTPResponse) ginresp.HTTPRespon
 	return res
 }
 
-func (ac *AppContext) GetOrCreateTransaction(db *db.Database) (sq.Tx, error) {
+func (ac *AppContext) GetOrCreateTransaction(db db.DatabaseImpl) (sq.Tx, error) {
 	if ac.cancelled {
 		return nil, errors.New("context cancelled")
 	}

scnserver/logic/application.go

@@ -4,7 +4,6 @@ import (
 	scn "blackforestbytes.com/simplecloudnotifier"
 	"blackforestbytes.com/simplecloudnotifier/api/apierr"
 	"blackforestbytes.com/simplecloudnotifier/api/ginresp"
-	"blackforestbytes.com/simplecloudnotifier/db"
 	"blackforestbytes.com/simplecloudnotifier/google"
 	"blackforestbytes.com/simplecloudnotifier/models"
 	"blackforestbytes.com/simplecloudnotifier/push"
@@ -28,7 +27,7 @@ import (
 type Application struct {
 	Config           scn.Config
 	Gin              *gin.Engine
-	Database         *db.Database
+	Database         *DBPool
 	Pusher           push.NotificationClient
 	AndroidPublisher google.AndroidPublisherClient
 	Jobs             []Job
@@ -37,7 +36,7 @@ type Application struct {
 	IsRunning        *syncext.AtomicBool
 }
 
-func NewApp(db *db.Database) *Application {
+func NewApp(db *DBPool) *Application {
 	return &Application{
 		Database:  db,
 		stopChan:  make(chan bool),
@@ -264,7 +263,7 @@ func (app *Application) getPermissions(ctx *AppContext, hdr string) (PermissionS
 
 	key := strings.TrimSpace(hdr[4:])
 
-	user, err := app.Database.GetUserByKey(ctx, key)
+	user, err := app.Database.Primary.GetUserByKey(ctx, key)
 	if err != nil {
 		return PermissionSet{}, err
 	}
@@ -283,7 +282,7 @@ func (app *Application) getPermissions(ctx *AppContext, hdr string) (PermissionS
 }
 
 func (app *Application) GetOrCreateChannel(ctx *AppContext, userid models.UserID, displayChanName string, intChanName string) (models.Channel, error) {
-	existingChan, err := app.Database.GetChannelByName(ctx, userid, intChanName)
+	existingChan, err := app.Database.Primary.GetChannelByName(ctx, userid, intChanName)
 	if err != nil {
 		return models.Channel{}, err
 	}
@@ -295,12 +294,12 @@ func (app *Application) GetOrCreateChannel(ctx *AppContext, userid models.UserID
 	subscribeKey := app.GenerateRandomAuthKey()
 	sendKey := app.GenerateRandomAuthKey()
 
-	newChan, err := app.Database.CreateChannel(ctx, userid, displayChanName, intChanName, subscribeKey, sendKey)
+	newChan, err := app.Database.Primary.CreateChannel(ctx, userid, displayChanName, intChanName, subscribeKey, sendKey)
 	if err != nil {
 		return models.Channel{}, err
 	}
 
-	_, err = app.Database.CreateSubscription(ctx, userid, newChan, true)
+	_, err = app.Database.Primary.CreateSubscription(ctx, userid, newChan, true)
 	if err != nil {
 		return models.Channel{}, err
 	}

scnserver/logic/dbpool.go

@@ -0,0 +1,88 @@
+package logic
+
+import (
+	scn "blackforestbytes.com/simplecloudnotifier"
+	"blackforestbytes.com/simplecloudnotifier/db"
+	logsdb "blackforestbytes.com/simplecloudnotifier/db/impl/logs"
+	primarydb "blackforestbytes.com/simplecloudnotifier/db/impl/primary"
+	requestsdb "blackforestbytes.com/simplecloudnotifier/db/impl/requests"
+	"context"
+)
+
+type DBPool struct {
+	Primary  *primarydb.Database
+	Requests *requestsdb.Database
+	Logs     *logsdb.Database
+}
+
+func NewDBPool(conf scn.Config) (*DBPool, error) {
+
+	dbprimary, err := primarydb.NewPrimaryDatabase(conf)
+	if err != nil {
+		return nil, err
+	}
+
+	dbrequests, err := requestsdb.NewRequestsDatabase(conf)
+	if err != nil {
+		return nil, err
+	}
+
+	dblogs, err := logsdb.NewLogsDatabase(conf)
+	if err != nil {
+		return nil, err
+	}
+
+	return &DBPool{
+		Primary:  dbprimary,
+		Requests: dbrequests,
+		Logs:     dblogs,
+	}, nil
+}
+
+func (p DBPool) List() []db.DatabaseImpl {
+	return []db.DatabaseImpl{
+		p.Primary,
+		p.Requests,
+		p.Logs,
+	}
+}
+
+func (p DBPool) Stop(ctx context.Context) error {
+
+	var err error = nil
+
+	for _, subdb := range p.List() {
+		err2 := subdb.Stop(ctx)
+		if err2 != nil && err == nil {
+			err = err2
+		}
+	}
+
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (p DBPool) Migrate(ctx context.Context) error {
+	for _, subdb := range p.List() {
+		err := subdb.Migrate(ctx)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (p DBPool) Ping(ctx context.Context) error {
+	for _, subdb := range p.List() {
+		err := subdb.Ping(ctx)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}

scnserver/logic/simplecontext.go

@@ -54,7 +54,7 @@ func (sc *SimpleContext) Cancel() {
 	sc.cancelFunc()
 }
 
-func (sc *SimpleContext) GetOrCreateTransaction(db *db.Database) (sq.Tx, error) {
+func (sc *SimpleContext) GetOrCreateTransaction(db db.DatabaseImpl) (sq.Tx, error) {
 	if sc.cancelled {
 		return nil, errors.New("context cancelled")
 	}