diff --git a/.gitignore b/.gitignore index 6933f7e3b..2154ba0e6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *.a *.6 -bin .settings +inquirer/inquirer +rater/rater diff --git a/src/inquirer/Makefile b/src/inquirer/Makefile index c809564de..ec3db1559 100644 --- a/src/inquirer/Makefile +++ b/src/inquirer/Makefile @@ -1,6 +1,8 @@ include $(GOROOT)/src/Make.inc TARG=inquirer -GOFILES=inquirer.go +GOFILES=\ + inquirer.go\ + registration/registration.go\ include $(GOROOT)/src/Make.cmd diff --git a/src/inquirer/inquirer.go b/src/inquirer/inquirer.go index 5afe2af3b..dd5cf7d39 100644 --- a/src/inquirer/inquirer.go +++ b/src/inquirer/inquirer.go @@ -5,12 +5,11 @@ import ( "log" "net/http" "net/rpc" - "registration" //"time" "errors" ) -var raterList *registration.RaterList +var raterList *RaterList func handler(w http.ResponseWriter, r *http.Request) { fmt.Fprint(w, "
    ") @@ -42,7 +41,7 @@ func testCallRater(){ } func main() { - raterList = registration.NewRaterList() + raterList = NewRaterList() go testCallRater() rpc.Register(raterList) rpc.HandleHTTP() diff --git a/src/inquirer/registration/registration.go b/src/inquirer/registration/registration.go index 9b45dff62..492244b58 100644 --- a/src/inquirer/registration/registration.go +++ b/src/inquirer/registration/registration.go @@ -1,4 +1,4 @@ -package registration +package main import ( "fmt" @@ -48,4 +48,4 @@ func (rl *RaterList) startBalance() { } } }() -} \ No newline at end of file +} diff --git a/src/rater/Makefile b/src/rater/Makefile index c809564de..1bfe527f8 100644 --- a/src/rater/Makefile +++ b/src/rater/Makefile @@ -1,6 +1,8 @@ include $(GOROOT)/src/Make.inc -TARG=inquirer -GOFILES=inquirer.go +TARG=rater +GOFILES=\ + rater.go\ + registration/registration.go\ include $(GOROOT)/src/Make.cmd diff --git a/src/rater/rater.go b/src/rater/rater.go index 8c5dfc115..084670e42 100644 --- a/src/rater/rater.go +++ b/src/rater/rater.go @@ -6,7 +6,6 @@ import ( "math" "net" "net/rpc" - "registration" ) var ( @@ -26,8 +25,8 @@ func main() { arith := new(Sumer) rpc.Register(arith) rpc.HandleHTTP() - go registration.RegisterToServer(server, listen) - //go registration.StopSingnalHandler(server, listen) + go RegisterToServer(server, listen) + go registration.StopSingnalHandler(server, listen) addr, err1 := net.ResolveTCPAddr("tcp", *listen) l, err2 := net.ListenTCP("tcp", addr) if err1 != nil || err2 != nil { diff --git a/src/rater/registration/registration.go b/src/rater/registration/registration.go index ca31d710a..c8e2cdcd2 100644 --- a/src/rater/registration/registration.go +++ b/src/rater/registration/registration.go @@ -1,4 +1,4 @@ -package registration +package main import ( "log" @@ -45,4 +45,4 @@ func RegisterToServer(server, listen *string) { if err := client.Close(); err != nil { log.Panic("Could not close server registration!") } -} \ No newline at end of file +}