aboutsummaryrefslogtreecommitdiff
path: root/server.go
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-03-31 11:28:15 +0200
committerDimitri Sokolyuk <demon@dim13.org>2016-03-31 11:28:15 +0200
commit94899ddaf95e79324de8bcdd70ca18ff834ec0be (patch)
tree6c3ade19899a77b4e28aee2d4f752164b6d3ae53 /server.go
parent647ff6e872fe9e1de936521acdb23373a610e68d (diff)
Separated routes branch
Diffstat (limited to 'server.go')
-rw-r--r--server.go40
1 files changed, 27 insertions, 13 deletions
diff --git a/server.go b/server.go
index e4afc91..a000cad 100644
--- a/server.go
+++ b/server.go
@@ -10,33 +10,47 @@ import (
type Server struct {
DataFile string
+ SNI
Route
- http.Server
+ httpServer http.Server
+ tlsServer http.Server
}
func NewServer(dataFile string) (*Server, error) {
- r := make(Route)
- s := http.Server{TLSConfig: &tls.Config{GetCertificate: r.GetCertificate}}
- server := &Server{Route: r, Server: s, DataFile: dataFile}
+ sni := make(SNI)
+
+ server := &Server{
+ DataFile: dataFile,
+ SNI: sni,
+ Route: make(Route),
+ httpServer: http.Server{
+ Addr: ":http",
+ },
+ tlsServer: http.Server{
+ Addr: ":https",
+ TLSConfig: &tls.Config{
+ GetCertificate: sni.GetCertificate,
+ },
+ },
+ }
if dataFile != "" {
server.Load(dataFile)
}
RegisterRPC(server)
- http.Handle("/debug/route", r)
+ http.Handle("/debug/route", server.Route)
return server, server.Update()
}
// Update routes from in-memory state
func (s *Server) Update() error {
- mux := http.NewServeMux()
+ httpMux := http.NewServeMux()
for k, v := range s.Route {
if v.Cert != nil && v.Key != nil {
cert, err := tls.X509KeyPair(v.Cert, v.Key)
if err != nil {
return err
}
- v.cert = &cert
- s.Route[k] = v
+ s.SNI[k] = &cert
}
up, err := url.Parse(v.Upstream)
if err != nil {
@@ -47,19 +61,19 @@ func (s *Server) Update() error {
}
switch up.Scheme {
case "ws":
- mux.Handle(v.Host, NewWebSocketProxy(up))
+ httpMux.Handle(v.Host, NewWebSocketProxy(up))
default:
- mux.Handle(v.Host, httputil.NewSingleHostReverseProxy(up))
+ httpMux.Handle(v.Host, httputil.NewSingleHostReverseProxy(up))
}
}
- s.Server.Handler = mux
+ s.httpServer.Handler = httpMux
return nil
}
func (s *Server) Start() error {
errc := make(chan error)
- go func() { errc <- s.ListenAndServe() }()
- go func() { errc <- s.ListenAndServeTLS("", "") }()
+ go func() { errc <- s.httpServer.ListenAndServe() }()
+ go func() { errc <- s.tlsServer.ListenAndServeTLS("", "") }()
go func() { errc <- http.ListenAndServe(":http-alt", nil) }()
return <-errc
}