From 1df89d4ce20357c7815acd56686d3c58054c0eb8 Mon Sep 17 00:00:00 2001
From: Leonardo Sala <leonardo.sala@psi.ch>
Date: Mon, 23 Mar 2015 11:41:19 +0100
Subject: [PATCH] test

---
 slsReceiverSoftware/include/RestHelper.h      | 76 ++++++++++---------
 .../src/UDPRESTImplementation.cpp             |  7 +-
 2 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/slsReceiverSoftware/include/RestHelper.h b/slsReceiverSoftware/include/RestHelper.h
index b3d679b26..92846750d 100644
--- a/slsReceiverSoftware/include/RestHelper.h
+++ b/slsReceiverSoftware/include/RestHelper.h
@@ -249,45 +249,47 @@ class RestHelper {
      * @return 
      */
     
-    int n=0;
+    int n = 0;
     int code = -1;
-    while(n<n_connection_tries){
-
-      req.setContentType("application/json");
-      //without this you need to tell the lenght: http://pocoproject.org/forum/viewtopic.php?f=12&t=5741&p=10019&hilit=post+json#p10019
-      // request.setContentLength(my_string.length());
-      req.setChunkedTransferEncoding(true);
-      try {
-	//istringstream rs(request_body);
-	//req.read(rs);
-	//cout << " --- " <<  rs << endl;
-	if (request_body == "")
-	  session->sendRequest( (req) );
-	else{
-		ostream &os = session->sendRequest( req ) ;
-		os << request_body;
-	}
-	
-	HTTPResponse res;
-	istream &is = session->receiveResponse(res);
-	StreamCopier::copyToString(is, *answer);
-	code = res.getStatus();
-	if (code != 200){
-	  FILE_LOG(logERROR) << "HTTP ERROR " << res.getStatus() << ": " << res.getReason() ;
-	  code = -1;
-	}
-	else
-	  code = 0;
-	return code;
-      }
-      catch (exception& e){
-	      FILE_LOG(logERROR) << "Exception connecting to "<< full_hostname << ": "<< e.what() << ", sleeping 5 seconds (" << n << "/"<<n_connection_tries << ")";
-	sleep(5);
-      }
-      n+=1;
+    while(n < n_connection_tries){
+	    
+	    req.setContentType("application/json");
+	    //without this you need to tell the lenght: http://pocoproject.org/forum/viewtopic.php?f=12&t=5741&p=10019&hilit=post+json#p10019
+	    // request.setContentLength(my_string.length());
+	    req.setChunkedTransferEncoding(true);
+	    try {
+		    //istringstream rs(request_body);
+		    //req.read(rs);
+		    //cout << " --- " <<  rs << endl;
+		    if (request_body == "")
+			    session->sendRequest( (req) );
+		    else{
+			    ostream &os = session->sendRequest( req ) ;
+			    os << request_body;
+		    }
+		    
+		    HTTPResponse res;
+		    istream &is = session->receiveResponse(res);
+		    StreamCopier::copyToString(is, *answer);
+		    code = res.getStatus();
+		    if (code != 200){
+			    FILE_LOG(logERROR) << "HTTP ERROR " << res.getStatus() << ": " << res.getReason() ;
+			    code = -1;
+		    }
+		    else
+			    code = 0;
+		    return code;
+	    }
+	    catch (exception& e){
+		    FILE_LOG(logERROR) << "Exception connecting to "<< full_hostname << ": "<< e.what() << ", sleeping 5 seconds (" << n << "/"<<n_connection_tries << ")";
+		    sleep(5);
+	    }
+	    n+=1;
     }
-
-    throw std::string("Cannot connect to the REST server! Please check...");
+    
+    std::cout << "Hostname: " << full_hostname << std::endl;
+    FILE_LOG(logERROR) << "Cannot connect to the REST server host " <<  full_hostname << "! Please check..." ; 
+    throw std::runtime_error("Cannot connect to the REST server! Please check...");
     //return code;
   }
 
diff --git a/slsReceiverSoftware/src/UDPRESTImplementation.cpp b/slsReceiverSoftware/src/UDPRESTImplementation.cpp
index e1b3a1114..12eba3021 100644
--- a/slsReceiverSoftware/src/UDPRESTImplementation.cpp
+++ b/slsReceiverSoftware/src/UDPRESTImplementation.cpp
@@ -110,7 +110,8 @@ void UDPRESTImplementation::initialize_REST(){
 			
 
 			if (code != 0){
-				throw answer;
+				FILE_LOG(logERROR) << __AT__ << " REST state returned: " << answer;
+				throw;
 			}
 			else{
 				isInitialized = true;
@@ -1202,8 +1203,8 @@ int UDPRESTImplementation::startReceiver(char message[]){
 	//std::string request_body =  "{\"settings\": {\"nimages\":1, \"scanid\":999, \"bit_depth\":16}}";
 	FILE_LOG(logDEBUG) << __FILE__ << "::" << " sending this configuration body: " << request_body;
 	code = rest->post_json("state/configure", &answer, request_body);
-	//code = rest->get_json("state", &answer);
-	//FILE_LOG(logDEBUG) << __FILE__ << "::" << " got: " << answer;
+	code = rest->get_json("state", &answer);
+	FILE_LOG(logDEBUG) << __FILE__ << "::" << " got: " << answer;
 
 	//code = rest->post_json("state/open", &answer);
 	//code = rest->get_json("state", &answer);