diff options
author | Benoit Foucher <benoit@zeroc.com> | 2006-06-14 11:53:24 +0000 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2006-06-14 11:53:24 +0000 |
commit | 59148b0d5d511366118d8ec474b6987e8086bb59 (patch) | |
tree | 2b732e8ff17ff8d4479927075e06dccaa4aa599c /cpp/src/IceGrid/Activator.cpp | |
parent | Fixed bug 1060 (diff) | |
download | ice-59148b0d5d511366118d8ec474b6987e8086bb59.tar.bz2 ice-59148b0d5d511366118d8ec474b6987e8086bb59.tar.xz ice-59148b0d5d511366118d8ec474b6987e8086bb59.zip |
Fixed bug 1038
Diffstat (limited to 'cpp/src/IceGrid/Activator.cpp')
-rw-r--r-- | cpp/src/IceGrid/Activator.cpp | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/cpp/src/IceGrid/Activator.cpp b/cpp/src/IceGrid/Activator.cpp index dacdc8519a6..1eb4a4d34d3 100644 --- a/cpp/src/IceGrid/Activator.cpp +++ b/cpp/src/IceGrid/Activator.cpp @@ -430,11 +430,11 @@ Activator::activate(const string& name, args.push_back("--Ice.StdErr=" + errFile); } - if(_traceLevels->activator > 1) + if(_traceLevels->activator > 0) { Ice::Trace out(_traceLevels->logger, _traceLevels->activatorCat); out << "activating server `" << name << "'"; - if(_traceLevels->activator > 2) + if(_traceLevels->activator > 1) { out << "\n"; out << "path = " << path << "\n"; @@ -621,11 +621,15 @@ Activator::activate(const string& name, setInterrupt(); - if(_traceLevels->activator > 0) - { - Ice::Trace out(_traceLevels->logger, _traceLevels->activatorCat); - out << "activated server `" << name << "' (pid = " << pi.dwProcessId << ")"; - } + // + // Don't print the following trace, this might interfere with the + // output of the started process if it fails with an error message. + // +// if(_traceLevels->activator > 0) +// { +// Ice::Trace out(_traceLevels->logger, _traceLevels->activatorCat); +// out << "activated server `" << name << "' (pid = " << pi.dwProcessId << ")"; +// } return static_cast<Ice::Int>(process.pid); #else @@ -770,11 +774,15 @@ Activator::activate(const string& name, setInterrupt(); - if(_traceLevels->activator > 0) - { - Ice::Trace out(_traceLevels->logger, _traceLevels->activatorCat); - out << "activated server `" << name << "' (pid = " << pid << ")"; - } + // + // Don't print the following trace, this might interfere with the + // output of the started process if it fails with an error message. + // +// if(_traceLevels->activator > 0) +// { +// Ice::Trace out(_traceLevels->logger, _traceLevels->activatorCat); +// out << "activated server `" << name << "' (pid = " << pid << ")"; +// } } return pid; |