Skip to content

Commit

Permalink
Remove SSL from the monitoring routes
Browse files Browse the repository at this point in the history
  • Loading branch information
sergystepanov committed Jul 7, 2023
1 parent be83b1c commit d7e8ca5
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion pkg/coordinator/coordinator.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func New(conf config.CoordinatorConfig, log *logger.Logger) (services service.Gr
}
services.Add(hub, h)
if conf.Coordinator.Monitoring.IsEnabled() {
services.Add(monitoring.New(conf.Coordinator.Monitoring, conf.Coordinator.Server, h.GetHost(), log))
services.Add(monitoring.New(conf.Coordinator.Monitoring, h.GetHost(), log))
}
return
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/coordinator/hub.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ func RequestToHandshake(data string) (*api.ConnectionRequest[com.Uid], error) {
}
handshake, err := api.UnwrapChecked[api.ConnectionRequest[com.Uid]](base64.URLEncoding.DecodeString(data))
if err != nil || handshake == nil {
return nil, fmt.Errorf("%v (%v)", err, handshake)
return nil, fmt.Errorf("%w (%v)", err, handshake)
}
return handshake, nil
}
Expand Down
3 changes: 1 addition & 2 deletions pkg/monitoring/monitoring.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ type Monitoring struct {

// New creates new monitoring service.
// The tag param specifies owner label for logs.
func New(conf config.Monitoring, servConf config.Server, baseAddr string, log *logger.Logger) *Monitoring {
func New(conf config.Monitoring, baseAddr string, log *logger.Logger) *Monitoring {
serv, err := httpx.NewServer(
net.JoinHostPort(baseAddr, strconv.Itoa(conf.Port)),
func(s *httpx.Server) httpx.Handler {
Expand Down Expand Up @@ -52,7 +52,6 @@ func New(conf config.Monitoring, servConf config.Server, baseAddr string, log *l
return h
},
httpx.WithPortRoll(true),
httpx.WithServerConfig(servConf),
httpx.HttpsRedirect(false),
httpx.WithLogger(log),
)
Expand Down
8 changes: 4 additions & 4 deletions pkg/network/httpx/server.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package httpx

import (
"errors"
"fmt"
"net/http"
"net/url"
Expand Down Expand Up @@ -133,13 +134,12 @@ func (s *Server) run() {
} else {
err = s.Serve(*s.listener)
}
switch err {
case http.ErrServerClosed:

if errors.Is(err, http.ErrServerClosed) {
s.log.Debug().Msgf("%s server was closed", protocol)
return
default:
s.log.Error().Err(err)
}
s.log.Error().Err(err)
}

func (s *Server) Stop() error {
Expand Down
2 changes: 1 addition & 1 deletion pkg/worker/worker.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func New(conf config.WorkerConfig, log *logger.Logger, done chan struct{}) (serv
}
services.Add(h)
if conf.Worker.Monitoring.IsEnabled() {
services.Add(monitoring.New(conf.Worker.Monitoring, conf.Worker.Server, h.GetHost(), log))
services.Add(monitoring.New(conf.Worker.Monitoring, h.GetHost(), log))
}
st, err := GetCloudStorage(conf.Storage.Provider, conf.Storage.Key)
if err != nil {
Expand Down

0 comments on commit d7e8ca5

Please sign in to comment.