WIP

handlers/bootstrap.go

@@ -4,11 +4,10 @@ import (
 	"log"
 	"os"
 
-	"github.com/docker/docker/client"
 	"github.com/googollee/go-socket.io"
 	"github.com/play-with-docker/play-with-docker/config"
-	"github.com/play-with-docker/play-with-docker/docker"
 	"github.com/play-with-docker/play-with-docker/event"
+	"github.com/play-with-docker/play-with-docker/provider"
 	"github.com/play-with-docker/play-with-docker/pwd"
 	"github.com/play-with-docker/play-with-docker/storage"
 )
@@ -18,23 +17,18 @@ var e event.EventApi
 var ws *socketio.Server
 
 func Bootstrap() {
-	c, err := client.NewEnvClient()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	d := docker.NewDocker(c)
+	sp := provider.NewLocalSessionProvider()
 
 	e = event.NewLocalBroker()
 
-	t := pwd.NewScheduler(e, d)
+	t := pwd.NewScheduler(e, sp)
 
 	s, err := storage.NewFileStorage(config.SessionsFile)
 
 	if err != nil && !os.IsNotExist(err) {
 		log.Fatal("Error initializing StorageAPI: ", err)
 	}
-	core = pwd.NewPWD(d, t, e, s)
+	core = pwd.NewPWD(sp, t, e, s)
 
 }
 

handlers/new_session.go

@@ -49,7 +49,10 @@ func NewSession(rw http.ResponseWriter, req *http.Request) {
 		log.Println(err)
 		//TODO: Return some error code
 	} else {
-		hostname := fmt.Sprintf("%s.%s", config.PWDCName, req.Host)
+		hostname := req.Host
+		if config.PWDCName != "" {
+			hostname = fmt.Sprintf("%s.%s", config.PWDCName, req.Host)
+		}
 		// If request is not a form, return sessionId in the body
 		if req.Header.Get("X-Requested-With") == "XMLHttpRequest" {
 			resp := NewSessionResponse{SessionId: s.Id, Hostname: hostname}