diff options
Diffstat (limited to 'cpp/src/IcePack/ServerDeployerI.cpp')
| -rw-r--r-- | cpp/src/IcePack/ServerDeployerI.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/cpp/src/IcePack/ServerDeployerI.cpp b/cpp/src/IcePack/ServerDeployerI.cpp index 0aa48dff273..19d495733bd 100644 --- a/cpp/src/IcePack/ServerDeployerI.cpp +++ b/cpp/src/IcePack/ServerDeployerI.cpp @@ -59,6 +59,12 @@ IcePack::ServerDeployerI::remove(const string& name, const Ice::Current&) { ServerRegistryPrx registry = _nodeInfo->getServerRegistry(); + // + // Component path is used to identify the component. For example: + // node1.server1.service3 + // + string componentPath = _nodeInfo->getNode()->getName() + "." + name; + ServerPrx server; try { @@ -69,6 +75,7 @@ IcePack::ServerDeployerI::remove(const string& name, const Ice::Current&) ServerDeploymentException ex; ex.server = name; ex.reason = "server doesn't exist"; + ex.component = componentPath; throw ex; } @@ -83,6 +90,7 @@ IcePack::ServerDeployerI::remove(const string& name, const Ice::Current&) ServerDeploymentException ex; ex.server = name; ex.reason = "server doesn't exist"; + ex.component = componentPath; throw ex; } @@ -93,8 +101,9 @@ IcePack::ServerDeployerI::remove(const string& name, const Ice::Current&) { ServerDeploymentException ex; ex.server = name; - ex.reason = "server is not from this node"; - throw ex; + ex.reason = "server is not managed by this node"; + ex.component = componentPath; + throw ex; } map<string, string> variables; @@ -102,12 +111,6 @@ IcePack::ServerDeployerI::remove(const string& name, const Ice::Current&) variables["binpath"] = desc.path; // Required for parsing to succeed. variables["libpath"] = ""; - // - // Component path is used to identify the component. For example: - // node1.server1.service3 - // - string componentPath = _nodeInfo->getNode()->getName() + "." + name; - ServerBuilder builder(_nodeInfo, variables, componentPath, desc.targets); // |