Fixed bug 2637, 2279 & 2057

5 files changed, 42 insertions, 13 deletions

diff --git a/cpp/config/templates.xml b/cpp/config/templates.xml
index 494c67c396e..f1889af40fe 100644
--- a/cpp/config/templates.xml
+++ b/cpp/config/templates.xml
@@ -37,7 +37,7 @@
         
       <parameter name="instance-name" default="${application}.Glacier2"/>
       <parameter name="client-endpoints"/>   
-      <parameter name="server-endpoints"/>
+      <parameter name="server-endpoints" default=""/>
       <parameter name="session-timeout" default="0"/>
     
       <server id="${instance-name}" exe="glacier2router">
diff --git a/cpp/src/Glacier2/FilterManager.cpp b/cpp/src/Glacier2/FilterManager.cpp
index 91d1b26424c..c806bcfbe15 100755
--- a/cpp/src/Glacier2/FilterManager.cpp
+++ b/cpp/src/Glacier2/FilterManager.cpp
@@ -172,7 +172,7 @@ Glacier2::FilterManager::FilterManager(const InstancePtr& instance, const Glacie
     }
 }
 
-Glacier2::FilterManager*
+Glacier2::FilterManagerPtr
 Glacier2::FilterManager::create(const InstancePtr& instance, const string& userId, const bool allowAddUser)
 {
     PropertiesPtr props = instance->properties();
diff --git a/cpp/src/Glacier2/FilterManager.h b/cpp/src/Glacier2/FilterManager.h
index db74035f80d..6b96d1cc16a 100755
--- a/cpp/src/Glacier2/FilterManager.h
+++ b/cpp/src/Glacier2/FilterManager.h
@@ -67,7 +67,7 @@ public:
         return _identitiesPrx;
     }
 
-    static FilterManager* 
+    static FilterManagerPtr 
     create(const InstancePtr&, const std::string&, const bool);
 
 private:
diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp
index 109d96dba42..e6d6d7d4070 100644
--- a/cpp/src/Ice/Application.cpp
+++ b/cpp/src/Ice/Application.cpp
@@ -8,6 +8,7 @@
 // **********************************************************************
 
 #include <Ice/Application.h>
+#include <Ice/LoggerI.h>
 #include <IceUtil/StaticMutex.h>
 #include <IceUtil/CtrlCHandler.h>
 #include <IceUtil/Cond.h>
@@ -565,7 +566,7 @@ Ice::Application::interrupted()
 }
 
 int
-Ice::Application::mainInternal(int argc, char* argv[], const InitializationData& initData)
+Ice::Application::mainInternal(int argc, char* argv[], const InitializationData& initializationData)
 {
     int status;
 
@@ -578,7 +579,22 @@ Ice::Application::mainInternal(int argc, char* argv[], const InitializationData&
 
         _interrupted = false;
         _appName = argv[0];
-            
+
+        //
+        // We parse the properties here to extract Ice.ProgramName.
+        // 
+        InitializationData initData = initializationData;
+        initData.properties = createProperties(argc, argv, initData.properties, initData.stringConverter);
+
+        //
+        // If the process logger is the default logger, we replace it with a
+        // a logger which is using the program name for the prefix.
+        //
+        if(LoggerIPtr::dynamicCast(getProcessLogger()))
+        {
+            setProcessLogger(new LoggerI(initData.properties->getProperty("Ice.ProgramName")));
+        }
+
         _application = this;
         _communicator = initialize(argc, argv, initData);
         _destroyed = false;
diff --git a/cpp/src/Ice/Service.cpp b/cpp/src/Ice/Service.cpp
index 45a88f9478b..ed6b2c98a1d 100755
--- a/cpp/src/Ice/Service.cpp
+++ b/cpp/src/Ice/Service.cpp
@@ -383,14 +383,15 @@ Ice::Service::main(int& argc, char* argv[], const InitializationData& initializa
 {
     _name = argv[0];
 
-#ifdef _WIN32
-
     //
-    // On Windows, we parse the properties here to extract Ice.EventLog.Source
+    // We parse the properties here to extract Ice.ProgramName and
+    // Ice.EventLog.Source on Windows.
     //
     InitializationData initData = initializationData;
     initData.properties = createProperties(argc, argv, initData.properties, initData.stringConverter);
 
+#ifdef _WIN32
+
     //
     // First check for the --service option.
     //
@@ -410,14 +411,13 @@ Ice::Service::main(int& argc, char* argv[], const InitializationData& initializa
             name = argv[idx + 1];
 
             //
-            // If the process logger the default logger then we use
+            // If the process logger is the default logger then we use
             // our own logger.
             //
             _logger = getProcessLogger();
             if(LoggerIPtr::dynamicCast(_logger))
             {
-                string eventLogSource = initData.properties->
-                    getPropertyWithDefault("Ice.EventLog.Source", name);
+                string eventLogSource = initData.properties->getPropertyWithDefault("Ice.EventLog.Source", name);
                 _logger = new SMEventLoggerI(eventLogSource);
                 setProcessLogger(_logger);
             }
@@ -595,8 +595,6 @@ Ice::Service::main(int& argc, char* argv[], const InitializationData& initializa
     // Check for --daemon, --noclose, --nochdir and --pidfile.
     //
 
-    const InitializationData& initData = initializationData;
-
     bool daemonize = false;
     bool closeFiles = true;
     bool changeDirectory = true;
@@ -676,6 +674,21 @@ Ice::Service::main(int& argc, char* argv[], const InitializationData& initializa
     }
 #endif
 
+    //
+    // If no logger has been set yet, we set it to the process logger. If the 
+    // process logger is the default logger, we change it to a logger which is
+    // using the program name for the prefix.
+    //
+    if(!_logger)
+    {
+        _logger = getProcessLogger();
+        if(LoggerIPtr::dynamicCast(_logger))
+        {
+            _logger = new LoggerI(initData.properties->getProperty("Ice.ProgramName"));
+            setProcessLogger(_logger);
+        }
+    }
+
     return run(argc, argv, initData);
 }