From c2424524b6b0baf4c801960a6ee16f821cfb5746 Mon Sep 17 00:00:00 2001
From: Radu Ioan Fericean <radu@fericean.ro>
Date: Wed, 25 Jan 2012 14:39:16 +0200
Subject: [PATCH] changed panic to exit

---
 src/inquirer/registration/registration.go |  3 ++-
 src/rater/rater.go                        |  4 +++-
 src/rater/registration/registration.go    | 12 ++++++++----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/inquirer/registration/registration.go b/src/inquirer/registration/registration.go
index 73e1edeb0..c550dd36e 100644
--- a/src/inquirer/registration/registration.go
+++ b/src/inquirer/registration/registration.go
@@ -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))
diff --git a/src/rater/rater.go b/src/rater/rater.go
index 752e3ba0c..155cb0b5f 100644
--- a/src/rater/rater.go
+++ b/src/rater/rater.go
@@ -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)
 }
diff --git a/src/rater/registration/registration.go b/src/rater/registration/registration.go
index c8e2cdcd2..b799f8a9a 100644
--- a/src/rater/registration/registration.go
+++ b/src/rater/registration/registration.go
@@ -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)
 	}
 }