mrva/mrvacommander
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Combine New/Setup functions

Browse Source
This commit is contained in:
Michael Hohn
2024-06-16 10:31:52 -07:00
committed by =Michael Hohn
parent f611f02d1c
commit cd0647836e
8 changed files with 47 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/storage/container.go
View File

@@ -32,13 +32,7 @@ func (s *StorageContainer) FindAvailableDBs(analysisReposRequested []common.Owne
return notFoundRepos, analysisRepos
}
func (s *StorageContainer) Setup(v *Visibles) {
// TODO XX: set up qldb_db
s.modules = v
}
func NewQLDBStore(startingID int) (*StorageContainer, error) {
func NewQLDBStore(startingID int, v *Visibles) (*StorageContainer, error) {
// TODO drop the startingID
db, err := ConnectDB(DBSpec{
Host: "postgres",
@@ -61,10 +55,13 @@ func NewQLDBStore(startingID int) (*StorageContainer, error) {
return nil, err
}
// TODO XX: set up qldb_db
s.modules = v
return &s, nil
}
func NewServerStore(startingID int) (*StorageContainer, error) {
func NewServerStore(startingID int, v *Visibles) (*StorageContainer, error) {
db, err := ConnectDB(DBSpec{
Host: "postgres",
Port: 5432,
@@ -85,6 +82,9 @@ func NewServerStore(startingID int) (*StorageContainer, error) {
return nil, err
}
// TODO XX: set up qldb_db
s.modules = v
return &s, nil
}

7
pkg/storage/storage.go
View File

@@ -23,13 +23,12 @@ var (
mutex sync.Mutex
)
func NewStorageSingle(startingID int) *StorageSingle {
func NewStorageSingle(startingID int, v *Visibles) *StorageSingle {
s := StorageSingle{currentID: startingID}
return &s
}
func (s *StorageSingle) Setup(v *Visibles) {
s.modules = v
return &s
}
func (s *StorageSingle) NextID() int {