From 557d19023642e5c1ffc6737319d8744a89f75609 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Tue, 8 Aug 2017 14:51:32 +0200 Subject: [PATCH] changes for rest implementation --- slsReceiverSoftware/gitInfo.txt | 8 ++++---- slsReceiverSoftware/include/gitInfoReceiver.h | 8 ++++---- slsReceiverSoftware/src/UDPRESTImplementation.cpp | 7 +++---- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/slsReceiverSoftware/gitInfo.txt b/slsReceiverSoftware/gitInfo.txt index 24b606ddf..b7d999556 100644 --- a/slsReceiverSoftware/gitInfo.txt +++ b/slsReceiverSoftware/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsReceiverSoftware URL: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git -Repsitory UUID: 6aedda5c374e0d0e9347b491fc451f3d4d4398b1 -Revision: 617 +Repsitory UUID: 1e33a1e0f7de91e255f4a1553445f80d184d84d2 +Revision: 620 Branch: 3.0-rc Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 622 -Last Changed Date: 2017-08-04 14:28:08.000000002 +0200 ./CMakeLists.txt +Last Changed Rev: 625 +Last Changed Date: 2017-08-08 08:55:46.000000002 +0200 ./src/utilities.cpp diff --git a/slsReceiverSoftware/include/gitInfoReceiver.h b/slsReceiverSoftware/include/gitInfoReceiver.h index be003015c..ae8a441d3 100644 --- a/slsReceiverSoftware/include/gitInfoReceiver.h +++ b/slsReceiverSoftware/include/gitInfoReceiver.h @@ -1,11 +1,11 @@ //#define SVNPATH "" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_receiver_software.git" //#define SVNREPPATH "" -#define SVNREPUUID "6aedda5c374e0d0e9347b491fc451f3d4d4398b1" -//#define SVNREV 0x622 +#define SVNREPUUID "1e33a1e0f7de91e255f4a1553445f80d184d84d2" +//#define SVNREV 0x625 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Dhanya_Maliakal" -#define SVNREV 0x622 -#define SVNDATE 0x20170804 +#define SVNREV 0x625 +#define SVNDATE 0x20170808 // diff --git a/slsReceiverSoftware/src/UDPRESTImplementation.cpp b/slsReceiverSoftware/src/UDPRESTImplementation.cpp index 683afee9f..2cef6d90d 100644 --- a/slsReceiverSoftware/src/UDPRESTImplementation.cpp +++ b/slsReceiverSoftware/src/UDPRESTImplementation.cpp @@ -192,7 +192,7 @@ void UDPRESTImplementation::initialize_REST(){ int UDPRESTImplementation::startReceiver(char message[]){ - int i; + //int i; FILE_LOG(logDEBUG) << __FILE__ << "::" << __func__ << " starting"; initialize_REST(); @@ -277,7 +277,7 @@ void UDPRESTImplementation::startReadout(){ * Its also called by TCP in case of illegal shut down such as Ctrl + c. * Upto you what you want to do with it. */ -int UDPRESTImplementation::shutDownUDPSockets(){ +void UDPRESTImplementation::shutDownUDPSockets(){ FILE_LOG(logDEBUG) << __AT__ << "called"; @@ -299,7 +299,7 @@ int UDPRESTImplementation::shutDownUDPSockets(){ //FILE_LOG(logDEBUG) << __AT__ << " numListeningThreads=" << numListeningThreads; if (rest == NULL){ FILE_LOG(logWARNING) << __AT__ << "No REST object initialized, closing..."; - return OK; + return; } // getting the state @@ -329,7 +329,6 @@ int UDPRESTImplementation::shutDownUDPSockets(){ //delete rest; FILE_LOG(logDEBUG) << __AT__ << "finished"; - return OK; }