changed panic to exit

This commit is contained in:
Radu Ioan Fericean
2012-01-25 14:39:16 +02:00
parent c29a50691b
commit c2424524b6
3 changed files with 13 additions and 6 deletions

View File

@@ -27,7 +27,8 @@ 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.Panic("Could not connect to client!")
log.Print("Could not connect to client!")
return err
}
rl.Clients[clientAddress] = client
log.Print(fmt.Sprintf("Server %v registered succesfully", clientAddress))

View File

@@ -6,6 +6,7 @@ import (
"math"
"net"
"net/rpc"
"os"
)
var (
@@ -30,7 +31,8 @@ func main() {
addr, err1 := net.ResolveTCPAddr("tcp", *listen)
l, err2 := net.ListenTCP("tcp", addr)
if err1 != nil || err2 != nil {
log.Panic("cannot create listener for specified address ", *listen)
log.Print("cannot create listener for specified address ", *listen)
os.Exit(1)
}
rpc.Accept(l)
}

View File

@@ -24,25 +24,29 @@ func StopSingnalHandler(server, listen *string) {
func unregisterFromServer(server, listen *string) {
client, err := rpc.DialHTTP("tcp", *server)
if err != nil {
log.Panic("Cannot register to server!")
log.Print("Cannot contact the server!")
os.Exit(1)
}
var reply byte
log.Print("Unregistering from server ", *server)
client.Call("RaterList.UnRegisterRater", *listen, &reply)
if err := client.Close(); err != nil {
log.Panic("Could not close server unregistration!")
log.Print("Could not close server unregistration!")
os.Exit(1)
}
}
func RegisterToServer(server, listen *string) {
client, err := rpc.DialHTTP("tcp", *server)
if err != nil {
log.Panic("Cannot register to server!")
log.Print("Cannot contact the server!")
os.Exit(1)
}
var reply byte
log.Print("Registering to server ", *server)
client.Call("RaterList.RegisterRater", *listen, &reply)
if err := client.Close(); err != nil {
log.Panic("Could not close server registration!")
log.Print("Could not close server registration!")
os.Exit(1)
}
}