Commit 6667754d authored by legoc's avatar legoc
Browse files

Remove host endpoint to simplify as it was useless

parent 15e503b7
...@@ -86,7 +86,7 @@ void This::init(int argc, char *argv[]) { ...@@ -86,7 +86,7 @@ void This::init(int argc, char *argv[]) {
std::string This::getReference() { std::string This::getReference() {
if (m_instance != 0) { if (m_instance != 0) {
ostringstream os; ostringstream os;
os << getName() << "." << getId() << "@" << getHostEndpoint(); os << getName() << "." << getId() << "@" << getEndpoint();
return os.str(); return os.str();
} }
return ""; return "";
...@@ -119,9 +119,10 @@ This::This(int argc, char *argv[]) : ...@@ -119,9 +119,10 @@ This::This(int argc, char *argv[]) :
string port = tokens[2]; string port = tokens[2];
istringstream is(port); istringstream is(port);
is >> m_port; is >> m_port;
m_hostEndpoint = m_url + ":" + port;
m_url = "tcp://localhost"; // We separated host endpoint and server in the past (server being tcp://localhost)
// but that generates troubles when two applications communicate remotely.
// However leave the same value seems to be ok.
m_serverEndpoint = m_url + ":" + port; m_serverEndpoint = m_url + ":" + port;
string nameId = tokens[3]; string nameId = tokens[3];
...@@ -181,9 +182,9 @@ int This::getTimeout() { ...@@ -181,9 +182,9 @@ int This::getTimeout() {
return m_instance->Services::getTimeout(); return m_instance->Services::getTimeout();
} }
const std::string& This::getHostEndpoint() { const std::string& This::getEndpoint() {
if (m_instance != 0) { if (m_instance != 0) {
return m_instance->m_hostEndpoint; return m_instance->m_serverEndpoint;
} }
static string result; static string result;
return result; return result;
...@@ -1203,7 +1204,7 @@ std::ostream& operator<<(std::ostream& os, const application::Responder& respond ...@@ -1203,7 +1204,7 @@ std::ostream& operator<<(std::ostream& os, const application::Responder& respond
os << "rep." << responder.getName() os << "rep." << responder.getName()
<< ":" << responder.m_impl->m_application->getName() << ":" << responder.m_impl->m_application->getName()
<< "." << responder.m_impl->m_application->getId() << "." << responder.m_impl->m_application->getId()
<< "@" << responder.m_impl->m_application->getHostEndpoint(); << "@" << responder.m_impl->m_application->getEndpoint();
return os; return os;
} }
...@@ -1213,7 +1214,7 @@ std::ostream& operator<<(std::ostream& os, const application::Requester& request ...@@ -1213,7 +1214,7 @@ std::ostream& operator<<(std::ostream& os, const application::Requester& request
os << "req." << requester.getName() os << "req." << requester.getName()
<< ":" << requester.m_impl->m_application->getName() << ":" << requester.m_impl->m_application->getName()
<< "." << requester.m_impl->m_application->getId() << "." << requester.m_impl->m_application->getId()
<< "@" << requester.m_impl->m_application->getHostEndpoint(); << "@" << requester.m_impl->m_application->getEndpoint();
return os; return os;
} }
......
...@@ -99,7 +99,7 @@ public: ...@@ -99,7 +99,7 @@ public:
static int getId(); static int getId();
static void setTimeout(int timeout); static void setTimeout(int timeout);
static int getTimeout(); static int getTimeout();
static const std::string& getHostEndpoint(); static const std::string& getEndpoint();
static Server& getServer(); static Server& getServer();
/** /**
...@@ -150,7 +150,6 @@ private: ...@@ -150,7 +150,6 @@ private:
void handleStopImpl(StopFunctionType function); void handleStopImpl(StopFunctionType function);
ApplicationImpl * m_impl; ApplicationImpl * m_impl;
std::string m_hostEndpoint;
std::string m_name; std::string m_name;
int m_id; int m_id;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment