diff --git a/cmd/inquirer/inquirer.go b/cmd/inquirer/inquirer.go index f6c9ac555..409a9ea93 100644 --- a/cmd/inquirer/inquirer.go +++ b/cmd/inquirer/inquirer.go @@ -12,7 +12,7 @@ var raterList *RaterList func handler(w http.ResponseWriter, r *http.Request) { fmt.Fprint(w, "
    ") - for addr, _ := range raterList.Clients { + for addr, _ := range raterList.clientAddresses { fmt.Fprint(w, fmt.Sprintf("
  1. %s
    2. ", addr)) } fmt.Fprint(w, "
") @@ -21,7 +21,7 @@ func handler(w http.ResponseWriter, r *http.Request) { func callRater(key string) (reply string) { err := errors.New("") //not nil value for err != nil { - client:= <-raterList.Balancer + client:= raterList.Balance() err = client.Call("Storage.Get", key, &reply) if err != nil { log.Printf("Got en error from rater: %v", err) diff --git a/cmd/loader/kyoto/kyoto_loader.go b/cmd/loader/kyoto/kyoto_loader.go index acb2a37ae..3d33549ec 100644 --- a/cmd/loader/kyoto/kyoto_loader.go +++ b/cmd/loader/kyoto/kyoto_loader.go @@ -2,8 +2,8 @@ package main import ( "fmt" - "github.com/fsouza/gokabinet/kc" - "flag" + "github.com/fsouza/gokabinet/kc" + "flag" ) var ( @@ -11,8 +11,8 @@ var ( ) func main() { flag.Parse() - db, _ := kc.Open(*fileName, kc.WRITE) - defer db.Close() + db, _ := kc.Open(*fileName, kc.WRITE) + defer db.Close() db.Set("test", "12223") fmt.Println("Done!") diff --git a/cmd/rater/rater.go b/cmd/rater/rater.go index 3ea860bf5..fac6c5fc9 100644 --- a/cmd/rater/rater.go +++ b/cmd/rater/rater.go @@ -30,7 +30,6 @@ func (s *Storage) Get(args string, reply *string) (err error) { func main() { flag.Parse() getter, err := NewKyotoStorage("storage.kch") - defer getter.Close() //getter, err := NewRedisStorage("tcp:127.0.0.1:6379") //defer getter.Close() if err != nil { @@ -41,7 +40,7 @@ func main() { rpc.Register(storage) rpc.HandleHTTP() go RegisterToServer(server, listen) - go StopSingnalHandler(server, listen) + go StopSingnalHandler(server, listen, getter) addr, err1 := net.ResolveTCPAddr("tcp", *listen) l, err2 := net.ListenTCP("tcp", addr) if err1 != nil || err2 != nil { diff --git a/cmd/rater/registration.go b/cmd/rater/registration.go index b799f8a9a..d3a2c61dd 100644 --- a/cmd/rater/registration.go +++ b/cmd/rater/registration.go @@ -8,7 +8,7 @@ import ( "syscall" ) -func StopSingnalHandler(server, listen *string) { +func StopSingnalHandler(server, listen *string, getter *KyotoStorage) { log.Print("Handling stop signals...") sig := <-signal.Incoming if usig, ok := sig.(os.UnixSignal); ok { @@ -16,6 +16,7 @@ func StopSingnalHandler(server, listen *string) { case syscall.SIGTERM, syscall.SIGINT, syscall.SIGQUIT: log.Printf("Caught signal %v, unregistering from server\n", usig) unregisterFromServer(server, listen) + getter.Close() os.Exit(1) } } diff --git a/cmd/test/sj.py b/cmd/stresstest/sj.py similarity index 100% rename from cmd/test/sj.py rename to cmd/stresstest/sj.py diff --git a/cmd/test/test.go b/cmd/stresstest/stress_test.go similarity index 77% rename from cmd/test/test.go rename to cmd/stresstest/stress_test.go index e8696a2ea..8283c6732 100644 --- a/cmd/test/test.go +++ b/cmd/stresstest/stress_test.go @@ -3,6 +3,7 @@ package main import ( "net/rpc" "fmt" + //"time" ) @@ -10,8 +11,9 @@ func main(){ client, _ := rpc.DialHTTPPath("tcp", "localhost:2000", "/rpc") var reply string i:= 0 - for ; i < 5 * 10e4; i++ { + for ; i < 5 * 10e3; i++ { client.Call("Responder.Get", "test", &reply) + //time.Sleep(1*time.Second) } fmt.Println(i, reply) } diff --git a/cmd/test/test.py b/cmd/stresstest/test.py similarity index 100% rename from cmd/test/test.py rename to cmd/stresstest/test.py diff --git a/cmd/test/test2.py b/cmd/stresstest/test2.py similarity index 100% rename from cmd/test/test2.py rename to cmd/stresstest/test2.py