diff --git a/src/inquirer/inquirer.go b/src/inquirer/inquirer.go index 1929145d3..f6c9ac555 100644 --- a/src/inquirer/inquirer.go +++ b/src/inquirer/inquirer.go @@ -5,7 +5,6 @@ import ( "log" "net/http" "net/rpc" - "time" "errors" ) @@ -28,20 +27,11 @@ func callRater(key string) (reply string) { log.Printf("Got en error from rater: %v", err) } } - //log.Print(fmt.Sprintf("Result: %v", reply)) return } -func testCallRater(key string){ - for { - callRater(key) - time.Sleep(1 * time.Second) - } -} - func main() { - raterList = NewRaterList() - //go testCallRater("test") + raterList = NewRaterList() rpc.Register(raterList) rpc.HandleHTTP() diff --git a/src/loader/kyoto_loader.go b/src/loader/kyoto_loader.go new file mode 100644 index 000000000..acb2a37ae --- /dev/null +++ b/src/loader/kyoto_loader.go @@ -0,0 +1,20 @@ +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!") +} + diff --git a/src/rater/Makefile b/src/rater/Makefile index f22328f21..02ce8264e 100644 --- a/src/rater/Makefile +++ b/src/rater/Makefile @@ -7,5 +7,6 @@ GOFILES=\ storage/interface.go\ storage/kyoto_storage.go\ storage/redis_storage.go\ + timestamps/timestamps.go\ include $(GOROOT)/src/Make.cmd diff --git a/src/rater/storage/kyoto_storage.go b/src/rater/storage/kyoto_storage.go index 0c313842d..57ef9906d 100644 --- a/src/rater/storage/kyoto_storage.go +++ b/src/rater/storage/kyoto_storage.go @@ -8,17 +8,17 @@ type KyotoStorage struct { db *kc.DB } -func NewKyotoStorage(filaName string) (KyotoStorage, error) { +func NewKyotoStorage(filaName string) (*KyotoStorage, error) { ndb, err := kc.Open(filaName, kc.READ) - return KyotoStorage{db: ndb}, err + return &KyotoStorage{db: ndb}, err } -func (ks KyotoStorage) Close() { +func (ks *KyotoStorage) Close() { ks.db.Close() } -func (ks KyotoStorage) Get(key string) (value string, err error) { +func (ks *KyotoStorage) Get(key string) (value string, err error) { return ks.db.Get(key) } diff --git a/src/rater/storage/redis_storage.go b/src/rater/storage/redis_storage.go index 55acc80db..3f3045773 100644 --- a/src/rater/storage/redis_storage.go +++ b/src/rater/storage/redis_storage.go @@ -8,17 +8,17 @@ type RedisStorage struct { db *godis.Client } -func NewRedisStorage(address string) (RedisStorage, error) { +func NewRedisStorage(address string) (*RedisStorage, error) { ndb:= godis.New(address, 10, "") - return RedisStorage{db: ndb}, nil + return &RedisStorage{db: ndb}, nil } -func (rs RedisStorage) Close() { +func (rs *RedisStorage) Close() { rs.db.Quit() } -func (rs RedisStorage) Get(key string) (string, error) { +func (rs *RedisStorage) Get(key string) (string, error) { elem, err := rs.db.Get(key) return elem.String(), err } diff --git a/src/rater/timestamps/timestamps.go b/src/rater/timestamps/timestamps.go new file mode 100644 index 000000000..07b6e58e7 --- /dev/null +++ b/src/rater/timestamps/timestamps.go @@ -0,0 +1,17 @@ +package main + +import ( + "time" +) + +type Rating struct { + ConnectFeeIn time.Time + PriceIn float32 + ConnectFeeOut time.Time + PriceOut float32 +} + +type Customer struct { + Id string + Prefix string +}