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

changes for rest implementation

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-08-08 14:51:32 +02:00
parent a40d18f8b2
commit 557d190236
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slsReceiverSoftware/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsReceiverSoftware Path: slsDetectorsPackage/slsReceiverSoftware
URL: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git 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 Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_receiver_software.git
Repsitory UUID: 6aedda5c374e0d0e9347b491fc451f3d4d4398b1 Repsitory UUID: 1e33a1e0f7de91e255f4a1553445f80d184d84d2
Revision: 617 Revision: 620
Branch: 3.0-rc Branch: 3.0-rc
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 622 Last Changed Rev: 625
Last Changed Date: 2017-08-04 14:28:08.000000002 +0200 ./CMakeLists.txt Last Changed Date: 2017-08-08 08:55:46.000000002 +0200 ./src/utilities.cpp

8
slsReceiverSoftware/include/gitInfoReceiver.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_receiver_software.git" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_receiver_software.git"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "6aedda5c374e0d0e9347b491fc451f3d4d4398b1" #define SVNREPUUID "1e33a1e0f7de91e255f4a1553445f80d184d84d2"
//#define SVNREV 0x622 //#define SVNREV 0x625
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal" #define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x622 #define SVNREV 0x625
#define SVNDATE 0x20170804 #define SVNDATE 0x20170808
// //

7
slsReceiverSoftware/src/UDPRESTImplementation.cpp
View File

@ -192,7 +192,7 @@ void UDPRESTImplementation::initialize_REST(){
int UDPRESTImplementation::startReceiver(char message[]){ int UDPRESTImplementation::startReceiver(char message[]){
int i; //int i;
FILE_LOG(logDEBUG) << __FILE__ << "::" << __func__ << " starting"; FILE_LOG(logDEBUG) << __FILE__ << "::" << __func__ << " starting";
initialize_REST(); initialize_REST();
@ -277,7 +277,7 @@ void UDPRESTImplementation::startReadout(){
* Its also called by TCP in case of illegal shut down such as Ctrl + c. * Its also called by TCP in case of illegal shut down such as Ctrl + c.
* Upto you what you want to do with it. * Upto you what you want to do with it.
*/ */
int UDPRESTImplementation::shutDownUDPSockets(){ void UDPRESTImplementation::shutDownUDPSockets(){
FILE_LOG(logDEBUG) << __AT__ << "called"; FILE_LOG(logDEBUG) << __AT__ << "called";
@ -299,7 +299,7 @@ int UDPRESTImplementation::shutDownUDPSockets(){
//FILE_LOG(logDEBUG) << __AT__ << " numListeningThreads=" << numListeningThreads; //FILE_LOG(logDEBUG) << __AT__ << " numListeningThreads=" << numListeningThreads;
if (rest == NULL){ if (rest == NULL){
FILE_LOG(logWARNING) << __AT__ << "No REST object initialized, closing..."; FILE_LOG(logWARNING) << __AT__ << "No REST object initialized, closing...";
return OK; return;
} }
// getting the state // getting the state
@ -329,7 +329,6 @@ int UDPRESTImplementation::shutDownUDPSockets(){
//delete rest; //delete rest;
FILE_LOG(logDEBUG) << __AT__ << "finished"; FILE_LOG(logDEBUG) << __AT__ << "finished";
return OK;
} }