Skip to content

Commit 557bf6e

Browse files
author
Aaron Schlesinger
committed
feat(boot.go,pkg/sshd/config.go): wire up the health server
1 parent 21ad624 commit 557bf6e

2 files changed

Lines changed: 11 additions & 2 deletions

File tree

boot.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"github.com/deis/builder/pkg"
1010
"github.com/deis/builder/pkg/conf"
1111
"github.com/deis/builder/pkg/gitreceive"
12+
"github.com/deis/builder/pkg/gitreceive/storage"
1213
"github.com/deis/builder/pkg/sshd"
1314
pkglog "github.com/deis/pkg/log"
1415
)
@@ -42,6 +43,13 @@ func main() {
4243
pkglog.Err("getting config for %s [%s]", serverConfAppName, err)
4344
os.Exit(1)
4445
}
46+
s3Client, err := storage.GetClient
47+
if err != nil {
48+
pkglog.Err("getting s3 client [%s]", err)
49+
os.Exit(1)
50+
}
51+
pkglog.Info("starting health check server on port %d", cnf.HealthSrvPort)
52+
go healthsrv.Start(cnf.HealtHSrvPort, s3Client)
4553
pkglog.Info("starting SSH server on %s:%d", cnf.SSHHostIP, cnf.SSHHostPort)
4654
os.Exit(pkg.Run(cnf.SSHHostIP, cnf.SSHHostPort, "boot"))
4755
},

pkg/sshd/config.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package sshd
22

33
// Config represents the required SSH server configuration
44
type Config struct {
5-
SSHHostIP string `envconfig:"SSH_HOST_IP" default:"0.0.0.0" required:"true"`
6-
SSHHostPort int `envconfig:"SSH_HOST_PORT" default:"2223" required:"true"`
5+
SSHHostIP string `envconfig:"SSH_HOST_IP" default:"0.0.0.0" required:"true"`
6+
SSHHostPort int `envconfig:"SSH_HOST_PORT" default:"2223" required:"true"`
7+
HealthSrvPort int `envconfig:"HEALTH_SERVER_PORT" default:"8092"`
78
}

0 commit comments

Comments
 (0)