diff --git a/common/config.go b/common/config.go index c9d0c55..4625643 100644 --- a/common/config.go +++ b/common/config.go @@ -8,7 +8,7 @@ import ( // Config keeps info about configuration of this daemon type Config struct { - DockerSocket string `envconfig:"DOCKER_SOCKET" default:"unix://var/run/docker.sock"` + DockerSocket string `envconfig:"DOCKER_SOCKET" default:"unix:///var/run/docker.sock"` Token string `envconfig:"TOKEN" required:"true"` AppsPath string `envconfig:"APPS_PATH" default:"/srv"` // Where applications are located AppsBindIPHTTP string `envconfig:"APPS_BIND_IP_HTTP" default:"0.0.0.0"` // On what IP apps' HTTP port gonna be bound diff --git a/glue/main.go b/glue/main.go index dceed95..01ecdcc 100644 --- a/glue/main.go +++ b/glue/main.go @@ -67,7 +67,8 @@ func (p *Processor) waitForApp() error { } statsProcessor := StatsProcessor{ - DB: p.DB, + DB: p.DB, + DockerSock: p.DockerSock, } for i := 0; i < loops; i++ { @@ -101,7 +102,8 @@ func (p *Processor) List() (apps.Apps, error) { appList := apps.Apps{} statsProcessor := StatsProcessor{ - DB: p.DB, + DB: p.DB, + DockerSock: p.DockerSock, } err := statsProcessor.GatherStates() @@ -124,7 +126,8 @@ func (p *Processor) Get() (apps.App, error) { app := apps.App{} statsProcessor := StatsProcessor{ - DB: p.DB, + DB: p.DB, + DockerSock: p.DockerSock, } err := statsProcessor.UpdateState(p.AppName) diff --git a/glue/stats.go b/glue/stats.go index 026f9e1..726210f 100644 --- a/glue/stats.go +++ b/glue/stats.go @@ -11,7 +11,8 @@ import ( // StatsProcessor covers all methods that are needed // to gather information about application containers. type StatsProcessor struct { - DB *gorm.DB + DB *gorm.DB + DockerSock string } // returns instance of getAppProcessor @@ -33,7 +34,8 @@ func (s *StatsProcessor) UpdateUsage(name string) error { } container := docker.Container{ - App: &app, + App: &app, + DockerSock: s.DockerSock, } state, err := container.GetState() @@ -63,7 +65,8 @@ func (s *StatsProcessor) UpdateState(name string) error { } container := docker.Container{ - App: &app, + App: &app, + DockerSock: s.DockerSock, } state, err := container.Status() if err != nil { diff --git a/main.go b/main.go index d617230..2df25fa 100644 --- a/main.go +++ b/main.go @@ -74,7 +74,8 @@ func main() { // Stats loop go func() { statsProcessor := glue.StatsProcessor{ - DB: common.GetDBConnection(), + DB: common.GetDBConnection(), + DockerSock: config.DockerSocket, } for {