zeroc-ice 3.6b1

data/ext/ice/cpp/src/Ice/LoggerAdminI.h

@@ -0,0 +1,46 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_LOGGER_ADMIN_I_H
+#define ICE_LOGGER_ADMIN_I_H
+
+#include <Ice/Config.h>
+#include <Ice/Logger.h>
+#include <Ice/PropertiesF.h>
+#include <Ice/CommunicatorF.h>
+
+namespace IceInternal
+{
+
+//
+// A logger that works in tandem with a "Logger" admin facet.
+//
+class LoggerAdminLogger : public Ice::Logger
+{
+public:
+
+    //
+    // Return the associated Admin facet
+    //
+    virtual Ice::ObjectPtr getFacet() const = 0;
+
+    //
+    // Destroy this logger, in particular join any thread
+    // that this logger may have started
+    //
+    virtual void destroy() = 0; 
+};
+typedef Handle<LoggerAdminLogger> LoggerAdminLoggerPtr;
+
+LoggerAdminLoggerPtr 
+createLoggerAdminLogger(const Ice::PropertiesPtr&, const Ice::LoggerPtr&);
+
+}
+
+#endif

data/ext/ice/cpp/src/Ice/LoggerF.cpp

@@ -0,0 +1,38 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+//
+// Ice version 3.6b
+//
+// <auto-generated>
+//
+// Generated from file `LoggerF.ice'
+//
+// Warning: do not edit this file.
+//
+// </auto-generated>
+//
+
+#ifndef ICE_API_EXPORTS
+#   define ICE_API_EXPORTS
+#endif
+#include <Ice/LoggerF.h>
+#include <IceUtil/PushDisableWarnings.h>
+#include <IceUtil/Iterator.h>
+#include <IceUtil/PopDisableWarnings.h>
+
+#ifndef ICE_IGNORE_VERSION
+#   if ICE_INT_VERSION  != 30651
+#       error Ice version mismatch: an exact match is required for beta generated code
+#   endif
+#endif
+
+namespace
+{
+
+}

data/ext/ice/cpp/src/Ice/LoggerI.cpp

@@ -0,0 +1,199 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <IceUtil/Time.h>
+#include <Ice/LoggerI.h>
+#include <IceUtil/Mutex.h>
+#include <IceUtil/MutexPtrLock.h>
+
+#ifdef _WIN32
+#  include <IceUtil/StringUtil.h>
+#  include <IceUtil/ScopedArray.h>
+#endif
+
+#include <Ice/LocalException.h>
+
+using namespace std;
+using namespace Ice;
+using namespace IceInternal;
+
+namespace
+{
+
+IceUtil::Mutex* outputMutex = 0;
+
+class Init
+{
+public:
+
+    Init()
+    {
+        outputMutex = new IceUtil::Mutex;
+    }
+
+    ~Init()
+    {
+        delete outputMutex;
+        outputMutex = 0;
+    }
+};
+
+Init init;
+
+}
+
+Ice::LoggerI::LoggerI(const string& prefix, const string& file, 
+                      bool convert, const IceUtil::StringConverterPtr& converter) :
+    _prefix(prefix),
+    _convert(convert),
+    _converter(converter)
+#if defined(_WIN32) && !defined(ICE_OS_WINRT)
+    , _consoleConverter(new IceUtil::WindowsStringConverter(GetConsoleOutputCP()))
+#endif
+
+{
+    if(!prefix.empty())
+    {
+        _formattedPrefix = prefix + ": ";
+    }
+
+    if(!file.empty())
+    {
+        _file = file;
+        _out.open(file, fstream::out | fstream::app);
+        if(!_out.is_open())
+        {
+            throw InitializationException(__FILE__, __LINE__, "FileLogger: cannot open " + _file);
+        }
+    }
+}
+
+Ice::LoggerI::~LoggerI()
+{
+    if(_out.is_open())
+    {
+        _out.close();
+    }
+}
+
+void
+Ice::LoggerI::print(const string& message)
+{
+    write(message, false);
+}
+
+void
+Ice::LoggerI::trace(const string& category, const string& message)
+{
+    string s = "-- " + IceUtil::Time::now().toDateTime() + " " + _formattedPrefix;
+    if(!category.empty())
+    {
+        s += category + ": ";
+    }
+    s += message;
+
+    write(s, true);
+}
+
+void
+Ice::LoggerI::warning(const string& message)
+{
+    write("-! " + IceUtil::Time::now().toDateTime() + " " + _formattedPrefix + "warning: " + message, true);
+}
+
+void
+Ice::LoggerI::error(const string& message)
+{
+    write("!! " + IceUtil::Time::now().toDateTime() + " " + _formattedPrefix + "error: " + message, true);
+}
+
+string
+Ice::LoggerI::getPrefix()
+{
+    return _prefix;
+}
+
+LoggerPtr
+Ice::LoggerI::cloneWithPrefix(const std::string& prefix)
+{
+    return new LoggerI(prefix, _file, _convert, _converter);
+}
+
+void
+Ice::LoggerI::write(const string& message, bool indent)
+{
+    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(outputMutex);
+
+    string s = message;
+
+    if(indent)
+    {
+        string::size_type idx = 0;
+        while((idx = s.find("\n", idx)) != string::npos)
+        {
+            s.insert(idx + 1, "   ");
+            ++idx;
+        }
+    }
+
+    if(_out.is_open())
+    {
+        _out << s << endl;
+    }
+    else
+    {
+#if !defined(_WIN32) || defined(ICE_OS_WINRT)
+        cerr << s << endl;
+#else
+        //
+        // Convert the message from the native narrow string encoding to the console
+        // code page encoding for printing. If the _convert member is set to false 
+        // we don't do any conversion.
+        //
+        if(!_convert)
+        {
+            //
+            // Use fprintf_s to avoid encoding conversion when stderr is connected
+            // to Windows console. When _convert is set to false we always output
+            // UTF-8 encoded messages.
+            //
+            fprintf_s(stderr, "%s\n", IceUtil::nativeToUTF8(s, _converter).c_str());
+            fflush(stderr);
+        }
+        else
+        {
+            try
+            {
+                // Convert message to UTF-8
+                string u8s = IceUtil::nativeToUTF8(s, _converter);
+                
+                // Then from UTF-8 to console CP
+                string consoleString;
+                _consoleConverter->fromUTF8(reinterpret_cast<const Byte*>(u8s.data()),
+                                            reinterpret_cast<const Byte*>(u8s.data() + u8s.size()), 
+                                            consoleString);
+
+                // We cannot use cerr here as writing to console using cerr
+                // will do its own conversion and will corrupt the messages.
+                //
+                fprintf_s(stderr, "%s\n", consoleString.c_str());
+            }
+            catch(const IceUtil::IllegalConversionException&)
+            {
+                //
+                // If there is a problem with the encoding conversions we just
+                // write the original message without encoding conversions.
+                //
+                fprintf_s(stderr, "%s\n", s.c_str());
+            }
+            fflush(stderr);
+        }
+#endif
+    }
+}

data/ext/ice/cpp/src/Ice/LoggerI.h

@@ -0,0 +1,57 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_LOGGER_I_H
+#define ICE_LOGGER_I_H
+
+#include <Ice/Logger.h>
+#include <IceUtil/FileUtil.h>
+#include <IceUtil/StringConverter.h>
+
+namespace Ice
+{
+
+class LoggerI : public Logger
+{
+public:
+
+    LoggerI(const std::string&, const std::string&, bool convert = true,
+            const IceUtil::StringConverterPtr& converter = 0);
+    ~LoggerI();
+
+    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&);
+    virtual std::string getPrefix();
+    virtual LoggerPtr cloneWithPrefix(const std::string&);
+
+private:
+
+    void write(const std::string&, bool);
+
+    const std::string _prefix;
+    std::string _formattedPrefix;
+    const bool _convert;
+    const IceUtil::StringConverterPtr _converter;
+    IceUtilInternal::ofstream _out;
+
+    std::string _file;
+
+#if defined(_WIN32) && !defined(ICE_OS_WINRT)
+    const IceUtil::StringConverterPtr _consoleConverter;
+#endif
+
+};
+
+typedef IceUtil::Handle<LoggerI> LoggerIPtr;
+
+}
+
+#endif

data/ext/ice/cpp/src/Ice/LoggerUtil.cpp

@@ -0,0 +1,107 @@
+
+// **********************************************************************
+//
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <Ice/LoggerUtil.h>
+#include <Ice/Logger.h>
+#include <Ice/Plugin.h>
+#include <Ice/LocalException.h>
+#include <Ice/Instance.h>
+
+using namespace std;
+
+namespace IceUtilInternal
+{
+
+extern bool ICE_DECLSPEC_IMPORT printStackTraces;
+
+}
+
+string
+Ice::LoggerOutputBase::str() const
+{
+    return _str.str();
+}
+
+ostringstream&
+Ice::LoggerOutputBase::__str()
+{
+    return _str;
+}
+
+Ice::LoggerOutputBase&
+Ice::operator<<(Ice::LoggerOutputBase& out, ios_base& (*val)(ios_base&))
+{
+    out.__str() << val;
+    return out;
+}
+
+Ice::LoggerOutputBase&
+Ice::loggerInsert(Ice::LoggerOutputBase& out, const IceUtil::Exception& ex)
+{
+    if(IceUtilInternal::printStackTraces)
+    {
+        out.__str() << ex.what() << '\n' << ex.ice_stackTrace();
+    }
+    else
+    {
+        out.__str() << ex.what();
+    }
+    return out;
+}
+
+
+Ice::Trace::Trace(const LoggerPtr& logger, const string& category) :
+    _logger(logger),
+    _category(category)
+{
+}
+
+Ice::Trace::~Trace()
+{
+    flush();
+}
+
+void
+Ice::Trace::flush()
+{
+    string s = __str().str();
+    if(!s.empty())
+    {
+        _logger->trace(_category, s);
+    }
+    __str().str("");
+}
+
+
+Ice::LoggerPlugin::LoggerPlugin(const CommunicatorPtr& communicator, const LoggerPtr& logger)
+{
+    if(communicator == 0)
+    {
+        throw PluginInitializationException(__FILE__, __LINE__, "Communicator cannot be null");
+    }
+
+    if(logger == 0)
+    {
+        throw PluginInitializationException(__FILE__, __LINE__, "Logger cannot be null");
+    }
+
+    IceInternal::InstancePtr instance = IceInternal::getInstance(communicator);
+    instance->setLogger(logger);
+}
+
+void
+Ice::LoggerPlugin::initialize()
+{
+}
+
+void
+Ice::LoggerPlugin::destroy()
+{
+}