summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/ServerI.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2006-09-04 19:39:59 +0000
committerBenoit Foucher <benoit@zeroc.com>2006-09-04 19:39:59 +0000
commit1ce69fc8c36f2b7fa1d71ebe18e7ac4de01e3268 (patch)
treecd87f8121980159fdafd6b01e6802ea594478b93 /cpp/src/IceGrid/ServerI.cpp
parenticegridadmin always uses routed config if possible. added error messages if (diff)
downloadice-1ce69fc8c36f2b7fa1d71ebe18e7ac4de01e3268.tar.bz2
ice-1ce69fc8c36f2b7fa1d71ebe18e7ac4de01e3268.tar.xz
ice-1ce69fc8c36f2b7fa1d71ebe18e7ac4de01e3268.zip
Improved observers, refactored topic manager and initialization Added
icegridadmin commands to examine the registries
Diffstat (limited to 'cpp/src/IceGrid/ServerI.cpp')
-rw-r--r--cpp/src/IceGrid/ServerI.cpp16
1 files changed, 12 insertions, 4 deletions
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp
index 8c8a65487d4..98eeedd45fb 100644
--- a/cpp/src/IceGrid/ServerI.cpp
+++ b/cpp/src/IceGrid/ServerI.cpp
@@ -567,8 +567,13 @@ ServerI::ServerI(const NodeIPtr& node, const ServerPrx& proxy, const string& ser
ifstream is(idFilePath.c_str());
if(is.good())
{
- is >> _info.uuid;
- is >> _info.revision;
+ char line[1024];
+ is.getline(line, 1024);
+ is.getline(line, 1024);
+ is.getline(line, 1024);
+ string ignore;
+ is >> ignore >> _info.uuid;
+ is >> ignore >> _info.revision;
}
else
{
@@ -1925,8 +1930,11 @@ ServerI::updateRevisionFile()
ofstream os(idFilePath.c_str());
if(os.good())
{
- os << _info.uuid << endl;
- os << _info.revision << endl;
+ os << "#" << endl;
+ os << "# This server belongs to the application `" << _info.application << "'" << endl;
+ os << "#" << endl;
+ os << "uuid: " << _info.uuid << endl;
+ os << "revision: " << _info.revision << endl;
}
}