Added UNIX-specific part for Logger::print() operation. Fixed bug in

    UNIX-specific code of icepatch2server. Removed check to see whether
    --nochdir is used only when --daemon is set in Ice::Service, so we can
    force --nochdir for icepatch2server.

4 files changed, 12 insertions, 9 deletions

diff --git a/cpp/src/Ice/Service.cpp b/cpp/src/Ice/Service.cpp
index d145d73df91..5cc681d11c0 100755
--- a/cpp/src/Ice/Service.cpp
+++ b/cpp/src/Ice/Service.cpp
@@ -348,12 +348,6 @@ Ice::Service::main(int& argc, char* argv[])
         return EXIT_FAILURE;
     }
 
-    if(!changeDirectory && !daemonize)
-    {
-        cerr << argv[0] << ": --nochdir must be used with --daemon" << endl;
-        return EXIT_FAILURE;
-    }
-
     if(daemonize)
     {
         configureDaemon(changeDirectory, closeFiles);
diff --git a/cpp/src/Ice/SysLoggerI.cpp b/cpp/src/Ice/SysLoggerI.cpp
index 5481f388b1e..cc26f2aeb98 100644
--- a/cpp/src/Ice/SysLoggerI.cpp
+++ b/cpp/src/Ice/SysLoggerI.cpp
@@ -15,6 +15,13 @@ using namespace Ice;
 using namespace IceInternal;
 
 void
+Ice::SysLoggerI::print(const string& message)
+{
+    IceUtil::Mutex::Lock sync(*this);
+    syslog(LOG_INFO, "%s", message.c_str());
+}
+
+void
 Ice::SysLoggerI::trace(const string& category, const string& message)
 {
     IceUtil::Mutex::Lock sync(*this);
diff --git a/cpp/src/Ice/SysLoggerI.h b/cpp/src/Ice/SysLoggerI.h
index fbfd6c3212f..ac4cea13016 100644
--- a/cpp/src/Ice/SysLoggerI.h
+++ b/cpp/src/Ice/SysLoggerI.h
@@ -20,6 +20,7 @@ class SysLoggerI : public Logger, public ::IceUtil::Mutex
 {
 public:
 
+    virtual void print(const std::string&);
     virtual void trace(const std::string&, const std::string&);
     virtual void warning(const std::string&);
     virtual void error(const std::string&);
diff --git a/cpp/src/IcePatch2/Server.cpp b/cpp/src/IcePatch2/Server.cpp
index a06d8b1889e..0b02416a7a0 100644
--- a/cpp/src/IcePatch2/Server.cpp
+++ b/cpp/src/IcePatch2/Server.cpp
@@ -238,7 +238,7 @@ IcePatch2::PatcherService::usage(const string& appName)
         "\n"
         "\n"
         "--daemon             Run as a daemon.\n"
-        "--noclose            Do not close open file descriptors.\n"
+        "--noclose            Do not close open file descriptors."
 
 	// --nochdir is intentionally not shown here. (See the comment in main().)
     );
@@ -283,8 +283,9 @@ main(int argc, char* argv[])
 
     try
     {
-        status = svc.main(argc + 1, v);
-    u
+	int ac = argc + 1;
+        status = svc.main(ac, v);
+    }
     catch(...)
     {
         // Ignore exceptions -- the only thing left to do is to free memory.