refactoring to separate master and volume server, so that these servers

can be embedded into other applications

go/weed/weed_server/volume_server.go

@@ -0,0 +1,67 @@
+package weed_server
+
+import (
+	"code.google.com/p/weed-fs/go/glog"
+	"code.google.com/p/weed-fs/go/storage"
+	"github.com/gorilla/mux"
+	"math/rand"
+	"time"
+)
+
+type VolumeServer struct {
+	masterNode   string
+	pulseSeconds int
+	dataCenter   string
+	rack         string
+	whiteList    []string
+	store        *storage.Store
+	version      string
+}
+
+func NewVolumeServer(r *mux.Router, version string, ip string, port int, publicUrl string, folders []string, maxCounts []int,
+	masterNode string, pulseSeconds int,
+	dataCenter string, rack string,
+	whiteList []string) *VolumeServer {
+	vs := &VolumeServer{
+		version:      version,
+		masterNode:   masterNode,
+		pulseSeconds: pulseSeconds,
+		dataCenter:   dataCenter,
+		rack:         rack,
+		whiteList:    whiteList,
+	}
+	vs.store = storage.NewStore(port, ip, publicUrl, folders, maxCounts)
+
+	r.HandleFunc("/submit", secure(vs.whiteList, vs.submitFromVolumeServerHandler))
+	r.HandleFunc("/status", secure(vs.whiteList, vs.statusHandler))
+	r.HandleFunc("/admin/assign_volume", secure(vs.whiteList, vs.assignVolumeHandler))
+	r.HandleFunc("/admin/vacuum_volume_check", secure(vs.whiteList, vs.vacuumVolumeCheckHandler))
+	r.HandleFunc("/admin/vacuum_volume_compact", secure(vs.whiteList, vs.vacuumVolumeCompactHandler))
+	r.HandleFunc("/admin/vacuum_volume_commit", secure(vs.whiteList, vs.vacuumVolumeCommitHandler))
+	r.HandleFunc("/admin/freeze_volume", secure(vs.whiteList, vs.freezeVolumeHandler))
+	r.HandleFunc("/", vs.storeHandler)
+
+	go func() {
+		connected := true
+		vs.store.SetMaster(vs.masterNode)
+		vs.store.SetDataCenter(vs.dataCenter)
+		vs.store.SetRack(vs.rack)
+		for {
+			err := vs.store.Join()
+			if err == nil {
+				if !connected {
+					connected = true
+					glog.V(0).Infoln("Reconnected with master")
+				}
+			} else {
+				if connected {
+					connected = false
+				}
+			}
+			time.Sleep(time.Duration(float32(vs.pulseSeconds*1e3)*(1+rand.Float32())) * time.Millisecond)
+		}
+	}()
+	glog.V(0).Infoln("store joined at", vs.masterNode)
+
+	return vs
+}