aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-03-29 13:07:43 +0200
committerDimitri Sokolyuk <demon@dim13.org>2016-03-29 13:07:43 +0200
commit6d55850fdff1faff388fb2a0649739ea857bf52f (patch)
treefa12acb38a669758c3da4b0db43bd52373b33c3e
parent20ac254c678d769dff0bdfac7276e60b13a1ee80 (diff)
Cleanup a bit
-rw-r--r--server.go22
-rw-r--r--server_test.go9
2 files changed, 15 insertions, 16 deletions
diff --git a/server.go b/server.go
index c0449ee..6f0fe48 100644
--- a/server.go
+++ b/server.go
@@ -3,7 +3,6 @@ package goxy
import (
"crypto/tls"
"encoding/gob"
- "log"
"net/http"
"net/http/httputil"
"net/url"
@@ -12,7 +11,7 @@ import (
)
type Server struct {
- Data string
+ DataFile string
Route
http.Server
}
@@ -20,21 +19,16 @@ type Server struct {
func NewServer(fname string) (*Server, error) {
r := make(Route)
s := http.Server{TLSConfig: &tls.Config{GetCertificate: r.GetCertificate}}
- server := &Server{Route: r, Server: s, Data: fname}
- if err := server.Load(); err != nil {
- log.Println(err)
- }
- if err := server.Restore(); err != nil {
- return nil, err
- }
+ server := &Server{Route: r, Server: s, DataFile: fname}
+ server.Load()
Register(server)
- return server, nil
+ return server, server.Restore()
}
// Save routes to persistent file
func (s Server) Save() error {
- if s.Data != "" {
- fd, err := os.Create(s.Data)
+ if s.DataFile != "" {
+ fd, err := os.Create(s.DataFile)
if err != nil {
return err
}
@@ -46,8 +40,8 @@ func (s Server) Save() error {
// Load routes from persistent file
func (s *Server) Load() error {
- if s.Data != "" {
- fd, err := os.Open(s.Data)
+ if s.DataFile != "" {
+ fd, err := os.Open(s.DataFile)
if err != nil {
return err
}
diff --git a/server_test.go b/server_test.go
index a514b3c..89f3baf 100644
--- a/server_test.go
+++ b/server_test.go
@@ -7,12 +7,16 @@ import (
"net/http"
"net/http/httptest"
"net/url"
+ "os"
"testing"
"golang.org/x/net/websocket"
)
-const cannary = "hello from backend"
+const (
+ cannary = "hello from backend"
+ dataFile = "test.gob"
+)
func TestReverseProxy(t *testing.T) {
backServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@@ -20,10 +24,11 @@ func TestReverseProxy(t *testing.T) {
}))
defer backServer.Close()
- server, err := NewServer("")
+ server, err := NewServer(dataFile)
if err != nil {
t.Error(err)
}
+ defer os.Remove(dataFile)
rpcServer := httptest.NewServer(nil)
defer rpcServer.Close()