summaryrefslogtreecommitdiff
path: root/cpp/src/IceBox/ServiceManagerI.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2013-01-23 20:57:06 +0100
committerJose <jose@zeroc.com>2013-01-23 20:57:06 +0100
commitaa2a190b453a5426d396703b9432953b2cf4af50 (patch)
tree351ef14f61372fd978853f5d1b4fd611779b5bd3 /cpp/src/IceBox/ServiceManagerI.cpp
parentFix for ICE-4841 - added no copy option when creating input stream (diff)
downloadice-aa2a190b453a5426d396703b9432953b2cf4af50.tar.bz2
ice-aa2a190b453a5426d396703b9432953b2cf4af50.tar.xz
ice-aa2a190b453a5426d396703b9432953b2cf4af50.zip
Fixed (ICE-5172) - Ice.LogFile doesn't work with IceBox services
Diffstat (limited to 'cpp/src/IceBox/ServiceManagerI.cpp')
-rw-r--r--cpp/src/IceBox/ServiceManagerI.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp
index 7000bb8fadf..13a8dc707f2 100644
--- a/cpp/src/IceBox/ServiceManagerI.cpp
+++ b/cpp/src/IceBox/ServiceManagerI.cpp
@@ -591,9 +591,17 @@ IceBox::ServiceManagerI::start(const string& service, const string& entryPoint,
}
//
- // Clone the logger to assign a new prefix.
+ // Clone the logger to assign a new prefix. If one of the built-in loggers is configured
+ // don't set any logger.
//
- initData.logger = _logger->cloneWithPrefix(initData.properties->getProperty("Ice.ProgramName"));
+ if(initData.properties->getProperty("Ice.LogFile").empty()
+#ifndef _WIN32
+ && initData.properties->getPropertyAsInt("Ice.UseSyslog") == 0
+#endif
+ )
+ {
+ initData.logger = _logger->cloneWithPrefix(initData.properties->getProperty("Ice.ProgramName"));
+ }
//
// If Ice metrics are enabled on the IceBox communicator, we also enable them on