detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-07 10:30:41 +02:00
Code Issues Actions Packages Releases Activity

fixed hardcoded port number, cleanup

Browse Source
This commit is contained in:
sala 2016-12-02 15:21:22 +00:00
parent 657d3e5759
commit 3c0ce23bc2
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
slsReceiverSoftware/src/UDPRESTImplementation.cpp
View File

@ -73,9 +73,7 @@ string UDPRESTImplementation::get_rest_state(RestHelper * rest/*, string *rest_s
int code = rest->get_json("v1/state", &answer); int code = rest->get_json("v1/state", &answer);
if ( code != -1 ){ if ( code != -1 ){
std::cout << answer << std::endl;
rest_state = answer["global_state"].getString(); rest_state = answer["global_state"].getString();
std::cout << rest_state << std::endl;
} }
//rest_state = *prs; //rest_state = *prs;
@ -89,17 +87,15 @@ void UDPRESTImplementation::initialize_REST(){
FILE_LOG(logDEBUG) << __AT__ << " REST status is initialized: " << isInitialized; FILE_LOG(logDEBUG) << __AT__ << " REST status is initialized: " << isInitialized;
std::cout<< fileIndex << " " << getUDPPortNumber() << std::endl;
string rest_state = ""; string rest_state = "";
std::string answer = ""; std::string answer = "";
// HORRIBLE FIX ME ASAP! // HORRIBLE FIX to get the main receiver
if (getUDPPortNumber() == 50011){ string filename = getFileName();
if (filename.substr(filename.length() - 2) == "d0"){
is_main_receiver = true; is_main_receiver = true;
} }
// if (is_main_receiver){
if (rest_hostname.empty()) { if (rest_hostname.empty()) {
FILE_LOG(logDEBUG) << __AT__ <<"can't initialize with empty string or NULL for detectorHostname"; FILE_LOG(logDEBUG) << __AT__ <<"can't initialize with empty string or NULL for detectorHostname";
throw; throw;
@ -124,8 +120,6 @@ void UDPRESTImplementation::initialize_REST(){
try{ try{
rest_state = get_rest_state(rest); rest_state = get_rest_state(rest);
std::cout << "AAAAAAAa " << rest_state << std::endl;
if (rest_state == ""){ if (rest_state == ""){
FILE_LOG(logERROR) << __AT__ << " REST state returned: " << rest_state; FILE_LOG(logERROR) << __AT__ << " REST state returned: " << rest_state;
@ -200,8 +194,6 @@ int UDPRESTImplementation::startReceiver(char message[]){
initialize_REST(); initialize_REST();
FILE_LOG(logDEBUG) << __FILE__ << "::" << __func__ << " initialized"; FILE_LOG(logDEBUG) << __FILE__ << "::" << __func__ << " initialized";
cout << "Starting Receiver" << endl;
std::string answer; std::string answer;
int code; int code;
//char *intStr = itoa(a); //char *intStr = itoa(a);
@ -215,7 +207,6 @@ int UDPRESTImplementation::startReceiver(char message[]){
string str_n = ss2.str(); string str_n = ss2.str();
cout << "Starting Receiver" << endl;
string rest_state = ""; string rest_state = "";
std::string request_body = "{\"settings\": {\"bit_depth\": " + str_dr + ", \"n_frames\": " + str_n + "}}"; std::string request_body = "{\"settings\": {\"bit_depth\": " + str_dr + ", \"n_frames\": " + str_n + "}}";
//std::string request_body = "{\"settings\": {\"nimages\":1, \"scanid\":999, \"bit_depth\":16}}"; //std::string request_body = "{\"settings\": {\"nimages\":1, \"scanid\":999, \"bit_depth\":16}}";
@ -228,7 +219,6 @@ int UDPRESTImplementation::startReceiver(char message[]){
rest_state = get_rest_state(rest); rest_state = get_rest_state(rest);
code = rest->post_json("v1/state/open", &answer); code = rest->post_json("v1/state/open", &answer);
std::cout << "AAAAAA " << rest_state << std::endl;
} }
status = RUNNING; status = RUNNING;
@ -309,11 +299,9 @@ int UDPRESTImplementation::shutDownUDPSockets(){
FILE_LOG(logWARNING) << "PLEASE WAIT WHILE CHECKING AND SHUTTING DOWN ALL CONNECTIONS!"; FILE_LOG(logWARNING) << "PLEASE WAIT WHILE CHECKING AND SHUTTING DOWN ALL CONNECTIONS!";
rest_state = get_rest_state(rest); rest_state = get_rest_state(rest);
std::cout << rest_state << std::endl;
while (rest_state != "OPEN"){ while (rest_state != "OPEN"){
rest_state = get_rest_state(rest); rest_state = get_rest_state(rest);
std::cout << rest_state << std::endl;
usleep(10000); usleep(10000);
} }
//while (rest_state != "TRANSIENT"){ //while (rest_state != "TRANSIENT"){
@ -322,9 +310,7 @@ int UDPRESTImplementation::shutDownUDPSockets(){
//} //}
code = rest->post_json("v1/state/close", &answer); code = rest->post_json("v1/state/close", &answer);
std::cout <<code << " " << answer << std::endl;
code = rest->post_json("v1/state/reset", &answer); code = rest->post_json("v1/state/reset", &answer);
std::cout << code << " " << answer << std::endl;
//rest_state = get_rest_state(rest); //rest_state = get_rest_state(rest);
//std::cout << rest_state << std::endl; //std::cout << rest_state << std::endl;