aboutsummaryrefslogtreecommitdiff
path: root/server.go
diff options
context:
space:
mode:
Diffstat (limited to 'server.go')
-rw-r--r--server.go12
1 files changed, 6 insertions, 6 deletions
diff --git a/server.go b/server.go
index 6f0fe48..159362a 100644
--- a/server.go
+++ b/server.go
@@ -2,7 +2,7 @@ package goxy
import (
"crypto/tls"
- "encoding/gob"
+ "encoding/json"
"net/http"
"net/http/httputil"
"net/url"
@@ -33,7 +33,7 @@ func (s Server) Save() error {
return err
}
defer fd.Close()
- return gob.NewEncoder(fd).Encode(s.Route)
+ return json.NewEncoder(fd).Encode(s.Route)
}
return nil
}
@@ -46,7 +46,7 @@ func (s *Server) Load() error {
return err
}
defer fd.Close()
- return gob.NewDecoder(fd).Decode(&s.Route)
+ return json.NewDecoder(fd).Decode(&s.Route)
}
return nil
}
@@ -81,10 +81,10 @@ func (s *Server) Restore() error {
return nil
}
-func (s *Server) Start() <-chan error {
- errc := make(chan error, 3)
+func (s *Server) Start() error {
+ errc := make(chan error)
go func() { errc <- s.ListenAndServe() }()
go func() { errc <- s.ListenAndServeTLS("", "") }()
go func() { errc <- http.ListenAndServe(":http-alt", nil) }()
- return errc
+ return <-errc
}