From 3d1fb32ad89f03636f8946b6cba9d6e3538e99c1 Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Fri, 27 Jan 2012 16:31:54 +0200 Subject: [PATCH] restruturing --- {inquirer => cmd/inquirer}/Makefile | 0 {inquirer => cmd/inquirer}/inquirer.go | 0 {loader => cmd/loader}/kyoto/Makefile | 0 {loader => cmd/loader}/kyoto/kyoto_loader.go | 0 {loader => cmd/loader}/redis/Makefile | 0 {loader => cmd/loader}/redis/redis_loader.go | 0 {rater => cmd/rater}/Makefile | 0 {rater => cmd/rater}/rater.go | 0 .../rater}/registration/registration.go | 0 {rater => cmd/rater}/storage/interface.go | 0 {rater => cmd/rater}/storage/kyoto_storage.go | 0 {rater => cmd/rater}/storage/redis_storage.go | 0 {rater => cmd/rater}/timestamps/timestamps.go | 0 {test => cmd/test}/Makefile | 0 {test => cmd/test}/sj.py | 0 {test => cmd/test}/test.go | 0 {test => cmd/test}/test.py | 0 {test => cmd/test}/test2.py | 0 inquirer/registration/registration.go | 69 ------------------- inquirer/responder/responder.go | 13 ---- loader/kyoto_loader.go | 20 ------ 21 files changed, 102 deletions(-) rename {inquirer => cmd/inquirer}/Makefile (100%) rename {inquirer => cmd/inquirer}/inquirer.go (100%) rename {loader => cmd/loader}/kyoto/Makefile (100%) rename {loader => cmd/loader}/kyoto/kyoto_loader.go (100%) rename {loader => cmd/loader}/redis/Makefile (100%) rename {loader => cmd/loader}/redis/redis_loader.go (100%) rename {rater => cmd/rater}/Makefile (100%) rename {rater => cmd/rater}/rater.go (100%) rename {rater => cmd/rater}/registration/registration.go (100%) rename {rater => cmd/rater}/storage/interface.go (100%) rename {rater => cmd/rater}/storage/kyoto_storage.go (100%) rename {rater => cmd/rater}/storage/redis_storage.go (100%) rename {rater => cmd/rater}/timestamps/timestamps.go (100%) rename {test => cmd/test}/Makefile (100%) rename {test => cmd/test}/sj.py (100%) rename {test => cmd/test}/test.go (100%) rename {test => cmd/test}/test.py (100%) rename {test => cmd/test}/test2.py (100%) delete mode 100644 inquirer/registration/registration.go delete mode 100644 inquirer/responder/responder.go delete mode 100644 loader/kyoto_loader.go diff --git a/inquirer/Makefile b/cmd/inquirer/Makefile similarity index 100% rename from inquirer/Makefile rename to cmd/inquirer/Makefile diff --git a/inquirer/inquirer.go b/cmd/inquirer/inquirer.go similarity index 100% rename from inquirer/inquirer.go rename to cmd/inquirer/inquirer.go diff --git a/loader/kyoto/Makefile b/cmd/loader/kyoto/Makefile similarity index 100% rename from loader/kyoto/Makefile rename to cmd/loader/kyoto/Makefile diff --git a/loader/kyoto/kyoto_loader.go b/cmd/loader/kyoto/kyoto_loader.go similarity index 100% rename from loader/kyoto/kyoto_loader.go rename to cmd/loader/kyoto/kyoto_loader.go diff --git a/loader/redis/Makefile b/cmd/loader/redis/Makefile similarity index 100% rename from loader/redis/Makefile rename to cmd/loader/redis/Makefile diff --git a/loader/redis/redis_loader.go b/cmd/loader/redis/redis_loader.go similarity index 100% rename from loader/redis/redis_loader.go rename to cmd/loader/redis/redis_loader.go diff --git a/rater/Makefile b/cmd/rater/Makefile similarity index 100% rename from rater/Makefile rename to cmd/rater/Makefile diff --git a/rater/rater.go b/cmd/rater/rater.go similarity index 100% rename from rater/rater.go rename to cmd/rater/rater.go diff --git a/rater/registration/registration.go b/cmd/rater/registration/registration.go similarity index 100% rename from rater/registration/registration.go rename to cmd/rater/registration/registration.go diff --git a/rater/storage/interface.go b/cmd/rater/storage/interface.go similarity index 100% rename from rater/storage/interface.go rename to cmd/rater/storage/interface.go diff --git a/rater/storage/kyoto_storage.go b/cmd/rater/storage/kyoto_storage.go similarity index 100% rename from rater/storage/kyoto_storage.go rename to cmd/rater/storage/kyoto_storage.go diff --git a/rater/storage/redis_storage.go b/cmd/rater/storage/redis_storage.go similarity index 100% rename from rater/storage/redis_storage.go rename to cmd/rater/storage/redis_storage.go diff --git a/rater/timestamps/timestamps.go b/cmd/rater/timestamps/timestamps.go similarity index 100% rename from rater/timestamps/timestamps.go rename to cmd/rater/timestamps/timestamps.go diff --git a/test/Makefile b/cmd/test/Makefile similarity index 100% rename from test/Makefile rename to cmd/test/Makefile diff --git a/test/sj.py b/cmd/test/sj.py similarity index 100% rename from test/sj.py rename to cmd/test/sj.py diff --git a/test/test.go b/cmd/test/test.go similarity index 100% rename from test/test.go rename to cmd/test/test.go diff --git a/test/test.py b/cmd/test/test.py similarity index 100% rename from test/test.py rename to cmd/test/test.py diff --git a/test/test2.py b/cmd/test/test2.py similarity index 100% rename from test/test2.py rename to cmd/test/test2.py diff --git a/inquirer/registration/registration.go b/inquirer/registration/registration.go deleted file mode 100644 index 3413c5112..000000000 --- a/inquirer/registration/registration.go +++ /dev/null @@ -1,69 +0,0 @@ -package main - -import ( - "fmt" - "log" - "net/rpc" - "time" - "sync" -) - -type RaterList struct { - Clients map[string]*rpc.Client - Balancer chan *rpc.Client - balancer_mutex sync.Mutex -} - -func NewRaterList() *RaterList { - r:= &RaterList{ - Clients: make(map[string]*rpc.Client), - Balancer: make(chan *rpc.Client), - } - r.startBalance() - return r -} - -func (rl *RaterList) RegisterRater(clientAddress string, replay *byte) error { - time.Sleep(1 * time.Second) // wait a second for Rater to start serving - client, err := rpc.Dial("tcp", clientAddress) - if err != nil { - log.Print("Could not connect to client!") - return err - } - rl.Clients[clientAddress] = client - log.Print(fmt.Sprintf("Rater %v registered succesfully.", clientAddress)) - if len(rl.Clients) == 1 { - // unlock the balancer on first rater - rl.balancer_mutex.Unlock() - } - return nil -} - -func (rl *RaterList) UnRegisterRater(clientAddress string, replay *byte) error { - - client, ok := rl.Clients[clientAddress] - if ok { - client.Close() - delete(rl.Clients, clientAddress) - log.Print(fmt.Sprintf("Rater %v unregistered succesfully.", clientAddress)) - } else { - log.Print(fmt.Sprintf("Server %v was not on my watch!", clientAddress)) - } - return nil -} - -func (rl *RaterList) startBalance() { - rl.balancer_mutex.Lock() - go func(){ - for { - rl.balancer_mutex.Lock() - for _, client := range rl.Clients { - //log.Printf("using server %s:", addr) - rl.Balancer <- client - } - if len(rl.Clients) != 0 { - rl.balancer_mutex.Unlock() - } - } - }() -} diff --git a/inquirer/responder/responder.go b/inquirer/responder/responder.go deleted file mode 100644 index c254f832c..000000000 --- a/inquirer/responder/responder.go +++ /dev/null @@ -1,13 +0,0 @@ -package main - -import ( - "fmt" -) - -type Responder int - -func (r *Responder) Get(args string, replay *string) error { - *replay = fmt.Sprintf("{'response': %s}", callRater(args)) - return nil -} - diff --git a/loader/kyoto_loader.go b/loader/kyoto_loader.go deleted file mode 100644 index acb2a37ae..000000000 --- a/loader/kyoto_loader.go +++ /dev/null @@ -1,20 +0,0 @@ -package main - -import ( - "fmt" - "github.com/fsouza/gokabinet/kc" - "flag" -) - -var ( - fileName = flag.String("fileName", "storage.kch", "kyoto storage file") -) -func main() { - flag.Parse() - db, _ := kc.Open(*fileName, kc.WRITE) - defer db.Close() - - db.Set("test", "12223") - fmt.Println("Done!") -} -