Moved fake dae back to ISISLiveData library.

For some reason it didn't work when in the same library with the listener. Re #7954
mantidproject · Sep 27, 2013 · 0ceae8e · 0ceae8e
1 parent 348d30e
commit 0ceae8e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/Code/Mantid/Framework/ISISLiveData/CMakeLists.txt b/Code/Mantid/Framework/ISISLiveData/CMakeLists.txt
@@ -1,10 +1,12 @@
 set ( SRC_FILES
    src/example.cpp
+   src/FakeISISEventDAE.cpp
 )
 
 set ( INC_FILES
   #inc/MantidISISLiveData/DllConfig.h
   inc/MantidISISLiveData/TCPEventStreamDefs.h
+  inc/MantidISISLiveData/FakeISISEventDAE.h
 )
 
 set ( TEST_FILES

diff --git a/...ata/inc/MantidLiveData/FakeISISEventDAE.h → ...inc/MantidISISLiveData/FakeISISEventDAE.h b/...ata/inc/MantidLiveData/FakeISISEventDAE.h → ...inc/MantidISISLiveData/FakeISISEventDAE.h
@@ -1,5 +1,5 @@
-#ifndef MANTID_LIVEDATA_FAKEISISHISTODAE_H_
-#define MANTID_LIVEDATA_FAKEISISHISTODAE_H_
+#ifndef MANTID_ISISLIVEDATA_FAKEISISHISTODAE_H_
+#define MANTID_ISISLIVEDATA_FAKEISISHISTODAE_H_
 
 //----------------------------------------------------------------------
 // Includes
@@ -16,7 +16,7 @@ namespace Poco
 
 namespace Mantid
 {
-namespace LiveData
+namespace ISISLiveData
 {
 /**
     Simulates ISIS histogram DAE. It runs continuously until canceled and listens to port 6789 for

diff --git a/...amework/LiveData/src/FakeISISEventDAE.cpp → ...ork/ISISLiveData/src/FakeISISEventDAE.cpp b/...amework/LiveData/src/FakeISISEventDAE.cpp → ...ork/ISISLiveData/src/FakeISISEventDAE.cpp
@@ -7,8 +7,8 @@ When connected starts sending event packets.
 //----------------------------------------------------------------------
 // Includes
 //----------------------------------------------------------------------
-#include "MantidLiveData/FakeISISEventDAE.h"
-#include "MantidLiveData/ISIS/TCPEventStreamDefs.h"
+#include "MantidISISLiveData/FakeISISEventDAE.h"
+#include "MantidISISLiveData/TCPEventStreamDefs.h"
 
 #include <Poco/Net/TCPServer.h>
 #include <Poco/Net/StreamSocket.h>
@@ -18,7 +18,7 @@ When connected starts sending event packets.
 
 namespace Mantid
 {
-namespace LiveData
+namespace ISISLiveData
 {
 // Register the algorithm into the algorithm factory
 DECLARE_ALGORITHM(FakeISISEventDAE);
@@ -162,7 +162,7 @@ void FakeISISEventDAE::exec()
     {
       break;
     }
-    progress( 0.0, "Fake DAE" );
+    progress( 0.0, "Fake ISIS event DAE" );
 
     // Sleep for 50 msec
     Poco::Thread::sleep(50);

diff --git a/Code/Mantid/Framework/LiveData/CMakeLists.txt b/Code/Mantid/Framework/LiveData/CMakeLists.txt
@@ -16,7 +16,6 @@ set ( SRC_FILES
 	src/SNSLiveEventDataListener.cpp
 	src/StartLiveData.cpp
   src/ISISLiveEventDataListener.cpp
-  src/FakeISISEventDAE.cpp
 )
 
 set ( SRC_UNITY_IGNORE_FILES src/LoadDAE/idc.cpp
@@ -38,7 +37,6 @@ set ( INC_FILES
 	inc/MantidLiveData/SNSLiveEventDataListener.h
 	inc/MantidLiveData/StartLiveData.h
   inc/MantidLiveData/ISISLiveEventDataListener.h
-  inc/MantidLiveData/FakeISISEventDAE.h
   inc/MantidLiveData/ISIS/TCPEventStreamDefs.h
 )
 

diff --git a/Code/Mantid/Framework/LiveData/src/ISISLiveEventDataListener.cpp b/Code/Mantid/Framework/LiveData/src/ISISLiveEventDataListener.cpp
@@ -77,14 +77,15 @@ ISISLiveEventDataListener::~ISISLiveEventDataListener()
 
 bool ISISLiveEventDataListener::connect(const Poco::Net::SocketAddress &address)
 {
-    std::cerr << "Connecting to " << address.toString() << std::endl;
     // If we don't have an address, force a connection to the test server running on
     // localhost on the default port
     if (address.host().toString().compare( "0.0.0.0") == 0)
     {
-      Poco::Net::SocketAddress tempAddress("localhost:10000");
+      Poco::Net::SocketAddress tempAddress("127.0.0.1:10000");
       try {
+          std::cerr << "Connecting to test service " << tempAddress.toString() << std::endl;
         m_socket.connect( tempAddress);  // BLOCKING connect
+        std::cerr << "Actually connected to " << m_socket.address().toString() << std::endl;
       } catch (...) {
         g_log.error() << "Connection to " << tempAddress.toString() << " failed." << std::endl;
         return false;
@@ -93,6 +94,7 @@ bool ISISLiveEventDataListener::connect(const Poco::Net::SocketAddress &address)
     else
     {
         try {
+            std::cerr << "Connecting to live DAE " << address.toString() << std::endl;
           m_socket.connect( address);  // BLOCKING connect
         } catch (...) {
           g_log.debug() << "Connection to " << address.toString() << " failed." << std::endl;