summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/IceGrid/Activator.cpp32
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;