diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-12-13 14:04:11 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-12-13 14:04:11 +0000 |
| commit | 8642754fe313e1df2cd28bb45a3cb278eab170a4 (patch) | |
| tree | 4f722789a0cefc24412e3d2f77621bb8f56facb1 /cpp/src/IceGrid/DescriptorParser.cpp | |
| parent | Fixed bug #1610 (diff) | |
| download | ice-8642754fe313e1df2cd28bb45a3cb278eab170a4.tar.bz2 ice-8642754fe313e1df2cd28bb45a3cb278eab170a4.tar.xz ice-8642754fe313e1df2cd28bb45a3cb278eab170a4.zip | |
Added support for server log files, "property" attribute in object element.
Fixed a bug in the locator implemntation where an incorrect timeout was
used.
Diffstat (limited to 'cpp/src/IceGrid/DescriptorParser.cpp')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorParser.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/cpp/src/IceGrid/DescriptorParser.cpp b/cpp/src/IceGrid/DescriptorParser.cpp index aedd3e9bfa0..2b59f169f6b 100644 --- a/cpp/src/IceGrid/DescriptorParser.cpp +++ b/cpp/src/IceGrid/DescriptorParser.cpp @@ -438,6 +438,14 @@ DescriptorHandler::startElement(const string& name, const IceXML::Attributes& at _currentCommunicator->addDbEnv(attributes); _inDbEnv = true; } + else if(name == "log") + { + if(!_currentCommunicator) + { + error("the <log> element can only be a child of a <server> or <service> element"); + } + _currentCommunicator->addLog(attributes); + } else if(name == "dbproperty") { if(!_inDbEnv) |