heavy refactoring of vault and web parts

main.go

@@ -97,13 +97,13 @@ func main() {
 	flag.Parse()
 	flag.Parse()
 	listenStr := fmt.Sprintf("%s:%d", *hostF, *portF)
 	listenStr := fmt.Sprintf("%s:%d", *hostF, *portF)
 	router := new(web.Svc)
 	router := new(web.Svc)
-	storage := vault.Store{30}
+	storage := vault.Store{TTL: *ttlF}
 	routing := []web.Route{
 	routing := []web.Route{
 		{URL: "/storage/{id}", Methods: []string{"GET"}, Handler: router.GetValue},
 		{URL: "/storage/{id}", Methods: []string{"GET"}, Handler: router.GetValue},
 		{URL: "/storage/{id}/{value}", Methods: []string{"PUT", "POST"}, Handler: router.SetValue},
 		{URL: "/storage/{id}/{value}", Methods: []string{"PUT", "POST"}, Handler: router.SetValue},
 		{URL: "/storage/{id}", Methods: []string{"DELETE"}, Handler: router.DelValue},
 		{URL: "/storage/{id}", Methods: []string{"DELETE"}, Handler: router.DelValue},
 	}
 	}
-	router.InitRouter(routing, storage.Exchange)
+	router.InitRouter(routing, &storage)
 	http.Handle("/", router.GetRouter())
 	http.Handle("/", router.GetRouter())
 	fmt.Printf("Listening: %s\n", listenStr)
 	fmt.Printf("Listening: %s\n", listenStr)
 	http.ListenAndServe(listenStr, nil)
 	http.ListenAndServe(listenStr, nil)

web/control.go

@@ -13,16 +13,13 @@ import (
 func (svc *Svc) GetValue(w http.ResponseWriter, r *http.Request) {
 func (svc *Svc) GetValue(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	vars := mux.Vars(r)
 	id := vars["id"]
 	id := vars["id"]
-	reply := make(chan vault.Message)
-	msg := vault.Message{Action: "GET", Reply: reply, Key: id}
-	svc.exchange <- msg
-	resp := <-reply
-	if resp.Error != true {
-		fmt.Fprint(w, resp.Value)
-		return
+	value, err := svc.store.GetValue(id)
+	if err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		fmt.Fprint(w, "FAILURE")
 	}
 	}
-	w.WriteHeader(http.StatusBadRequest)
-	fmt.Fprint(w, "FAILURE")
+	fmt.Fprint(w, value)
+	return
 }
 }
 
 
 // SetValue - установить/обновить значение ключа
 // SetValue - установить/обновить значение ключа
@@ -30,36 +27,31 @@ func (svc *Svc) SetValue(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	vars := mux.Vars(r)
 	id := vars["id"]
 	id := vars["id"]
 	v := vars["value"]
 	v := vars["value"]
-	reply := make(chan vault.Message)
-	msg := vault.Message{Action: "SET", Reply: reply, Key: id, Value: v}
-	svc.exchange <- msg
-	resp := <-reply
-	if resp.Error != true {
-		fmt.Fprint(w, "OK")
-		return
+	err := svc.store.SetValue(id, v)
+	if err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		fmt.Fprint(w, "FAILURE")
 	}
 	}
-	w.WriteHeader(http.StatusBadRequest)
-	fmt.Fprint(w, "FAILURE")
+	fmt.Fprint(w, "OK")
+	return
+
 }
 }
 
 
 // DelValue - удалить ключ из хранилища
 // DelValue - удалить ключ из хранилища
 func (svc *Svc) DelValue(w http.ResponseWriter, r *http.Request) {
 func (svc *Svc) DelValue(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	vars := mux.Vars(r)
 	id := vars["id"]
 	id := vars["id"]
-	reply := make(chan vault.Message)
-	msg := vault.Message{Action: "DEL", Reply: reply, Key: id}
-	svc.exchange <- msg
-	resp := <-reply
-	if resp.Error != true {
-		fmt.Fprint(w, "OK")
-		return
+	err := svc.store.DelValue(id)
+	if err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		fmt.Fprint(w, "FAILURE")
 	}
 	}
-	w.WriteHeader(http.StatusBadRequest)
-	fmt.Fprint(w, "FAILURE")
+	fmt.Fprint(w, "OK")
+	return
 }
 }
 
 
 // InitRouter - инициализировать маршрутизацию запросов
 // InitRouter - инициализировать маршрутизацию запросов
-func (svc *Svc) InitRouter(routes []Route, exch chan vault.Message) {
+func (svc *Svc) InitRouter(routes []Route, store *vault.Store) {
 	if svc.router != nil {
 	if svc.router != nil {
 		return
 		return
 	}
 	}
@@ -69,7 +61,7 @@ func (svc *Svc) InitRouter(routes []Route, exch chan vault.Message) {
 			svc.router.HandleFunc(i.URL, i.Handler).Methods(j)
 			svc.router.HandleFunc(i.URL, i.Handler).Methods(j)
 		}
 		}
 	}
 	}
-	svc.exchange = exch
+	svc.store = store
 	return
 	return
 }
 }
 
 

web/data.go

@@ -16,6 +16,6 @@ type Route struct {
 
 
 // Svc - обмен данными с хранилищем
 // Svc - обмен данными с хранилищем
 type Svc struct {
 type Svc struct {
-	exchange chan vault.Message
-	router   *mux.Router
+	store  *vault.Store
+	router *mux.Router
 }
 }