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

Simplify naming, don't restate package name

Browse Source
This commit is contained in:
Michael Hohn
2024-06-11 16:55:10 -07:00
committed by =Michael Hohn
parent 2d88b351ff
commit 9c0cdb1fe4
9 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/server/main.go
View File

@@ -87,7 +87,7 @@ func main() {
os.Exit(1) os.Exit(1)
} }
sc.Setup(&server.CommanderVisibles{ sc.Setup(&server.Visibles{
Logger: sl, Logger: sl,
Queue: sq, Queue: sq,
ServerStore: ss, ServerStore: ss,
@@ -95,15 +95,15 @@ func main() {
QLDBStore: ql, QLDBStore: ql,
}) })
sl.Setup(&logger.LoggerVisibles{}) sl.Setup(&logger.Visibles{})
sq.Setup(&queue.QueueVisibles{ sq.Setup(&queue.Visibles{
Logger: sl, Logger: sl,
}) })
ss.Setup(&storage.ServerStorageVisibles{}) ss.Setup(&storage.Visibles{})
sr.Setup(&agent.RunnerVisibles{ sr.Setup(&agent.Visibles{
Logger: sl, Logger: sl,
Queue: sq, Queue: sq,
QueryPackStore: qp, QueryPackStore: qp,
@@ -136,7 +136,7 @@ func main() {
sr := agent.NewRunnerSingle(2, sq) // FIXME take value from configuration sr := agent.NewRunnerSingle(2, sq) // FIXME take value from configuration
sc.Setup(&server.CommanderVisibles{ sc.Setup(&server.Visibles{
Logger: sl, Logger: sl,
Queue: sq, Queue: sq,
ServerStore: ss, ServerStore: ss,
@@ -144,15 +144,15 @@ func main() {
QLDBStore: ql, QLDBStore: ql,
}) })
sl.Setup(&logger.LoggerVisibles{}) sl.Setup(&logger.Visibles{})
sq.Setup(&queue.QueueVisibles{ sq.Setup(&queue.Visibles{
Logger: sl, Logger: sl,
}) })
ss.Setup(&storage.ServerStorageVisibles{}) ss.Setup(&storage.Visibles{})
sr.Setup(&agent.RunnerVisibles{ sr.Setup(&agent.Visibles{
Logger: sl, Logger: sl,
Queue: sq, Queue: sq,
QueryPackStore: qp, QueryPackStore: qp,

4
pkg/agent/agent.go
View File

@@ -33,7 +33,7 @@ func NewRunnerSingle(numWorkers int, queue queue.Queue) *RunnerSingle {
return &r return &r
} }
type RunnerVisibles struct { type Visibles struct {
Logger logger.Logger Logger logger.Logger
Queue queue.Queue Queue queue.Queue
// TODO extra package for query pack storage // TODO extra package for query pack storage
@@ -42,7 +42,7 @@ type RunnerVisibles struct {
QLDBStore storage.Storage QLDBStore storage.Storage
} }
func (c *RunnerSingle) Setup(st *RunnerVisibles) { func (c *RunnerSingle) Setup(st *Visibles) {
return return
} }

6
pkg/logger/types.go
View File

@@ -1,7 +1,7 @@
package logger package logger
type LoggerSingle struct { type LoggerSingle struct {
modules *LoggerVisibles modules *Visibles
} }
func NewLoggerSingle() *LoggerSingle { func NewLoggerSingle() *LoggerSingle {
@@ -9,8 +9,8 @@ func NewLoggerSingle() *LoggerSingle {
return &l return &l
} }
type LoggerVisibles struct{} type Visibles struct{}
func (l *LoggerSingle) Setup(v *LoggerVisibles) { func (l *LoggerSingle) Setup(v *Visibles) {
l.modules = v l.modules = v
} }

6
pkg/queue/types.go
View File

@@ -9,14 +9,14 @@ type QueueSingle struct {
NumWorkers int NumWorkers int
jobs chan common.AnalyzeJob jobs chan common.AnalyzeJob
results chan common.AnalyzeResult results chan common.AnalyzeResult
modules *QueueVisibles modules *Visibles
} }
type QueueVisibles struct { type Visibles struct {
Logger logger.Logger Logger logger.Logger
} }
func (q *QueueSingle) Setup(v *QueueVisibles) { func (q *QueueSingle) Setup(v *Visibles) {
q.modules = v q.modules = v
} }

2
pkg/server/server.go
View File

@@ -21,7 +21,7 @@ import (
"github.com/gorilla/mux" "github.com/gorilla/mux"
) )
func (c *CommanderSingle) Setup(st *CommanderVisibles) { func (c *CommanderSingle) Setup(st *Visibles) {
r := mux.NewRouter() r := mux.NewRouter()
c.st = st c.st = st

4
pkg/server/types.go
View File

@@ -26,7 +26,7 @@ type SessionInfo struct {
} }
type CommanderSingle struct { type CommanderSingle struct {
st *CommanderVisibles st *Visibles
} }
func NewCommanderSingle() *CommanderSingle { func NewCommanderSingle() *CommanderSingle {
@@ -42,7 +42,7 @@ func NewCommanderSingle() *CommanderSingle {
// Runner agent.Runner // Runner agent.Runner
// } // }
type CommanderVisibles struct { type Visibles struct {
Logger logger.Logger Logger logger.Logger
Queue queue.Queue Queue queue.Queue
ServerStore storage.Storage ServerStore storage.Storage

2
pkg/storage/container.go
View File

@@ -32,7 +32,7 @@ func (s *StorageContainer) FindAvailableDBs(analysisReposRequested []common.Owne
return notFoundRepos, analysisRepos return notFoundRepos, analysisRepos
} }
func (s *StorageContainer) Setup(v *ServerStorageVisibles) { func (s *StorageContainer) Setup(v *Visibles) {
s.modules = v s.modules = v
} }

2
pkg/storage/storage.go
View File

@@ -28,7 +28,7 @@ func NewStorageSingle(startingID int) *StorageSingle {
return &s return &s
} }
func (s *StorageSingle) Setup(v *ServerStorageVisibles) { func (s *StorageSingle) Setup(v *Visibles) {
s.modules = v s.modules = v
} }

6
pkg/storage/types.go
View File

@@ -13,7 +13,7 @@ type DBLocation struct {
type StorageSingle struct { type StorageSingle struct {
currentID int currentID int
modules *ServerStorageVisibles modules *Visibles
} }
type DBSpec struct { type DBSpec struct {
@@ -60,7 +60,7 @@ type StorageContainer struct {
// Database version of StorageSingle // Database version of StorageSingle
RequestID int RequestID int
DB *gorm.DB DB *gorm.DB
modules *ServerStorageVisibles modules *Visibles
} }
type ServerStorageVisibles struct{} type Visibles struct{}