Merge pull request #920 from gobitfly/BEDS-448/split-up-requires

split network and user db requires up

Author: manuelsc

backend/cmd/misc/commands/app_bundle.go

@@ -36,7 +36,7 @@ func (s *AppBundleCommand) ParseCommandOptions() {
 
 func (s *AppBundleCommand) Requires() misctypes.Requires {
 	return misctypes.Requires{
-		DBs: true,
+		UserDBs: true,
 	}
 }
 

backend/cmd/misc/main.go

@@ -135,11 +135,12 @@ func Run() {
 	requires, ok := REQUIRES_LIST[opts.Command]
 	if !ok {
 		requires = misctypes.Requires{
-			Bigtable: true,
-			Redis:    true,
-			ClNode:   true,
-			ElNode:   true,
-			DBs:      true,
+			Bigtable:   true,
+			Redis:      true,
+			ClNode:     true,
+			ElNode:     true,
+			UserDBs:    true,
+			NetworkDBs: true,
 		}
 	}
 
@@ -175,7 +176,7 @@ func Run() {
 		}
 	}
 
-	if requires.DBs {
+	if requires.NetworkDBs {
 		db.WriterDb, db.ReaderDb = db.MustInitDB(&types.DatabaseConfig{
 			Username:     cfg.WriterDatabase.Username,
 			Password:     cfg.WriterDatabase.Password,
@@ -197,6 +198,8 @@ func Run() {
 		}, "pgx", "postgres")
 		defer db.ReaderDb.Close()
 		defer db.WriterDb.Close()
+	}
+	if requires.UserDBs {
 		db.FrontendWriterDB, db.FrontendReaderDB = db.MustInitDB(&types.DatabaseConfig{
 			Username:     cfg.Frontend.WriterDatabase.Username,
 			Password:     cfg.Frontend.WriterDatabase.Password,

backend/cmd/misc/misctypes/requires.go

@@ -1,9 +1,10 @@
 package misctypes
 
 type Requires struct {
-	Bigtable bool
-	Redis    bool
-	ClNode   bool
-	ElNode   bool
-	DBs      bool
+	Bigtable   bool
+	Redis      bool
+	ClNode     bool
+	ElNode     bool
+	NetworkDBs bool
+	UserDBs    bool
 }