X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcore%2Ftracing%2FLogger.cpp;h=c8b7ec4778bf9f85362dcbe5103ed51b2ad21504;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=d58e9468075739092f51c437ad90cde8257d6bbb;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git diff --git a/source/core/tracing/Logger.cpp b/source/core/tracing/Logger.cpp index d58e946..c8b7ec4 100644 --- a/source/core/tracing/Logger.cpp +++ b/source/core/tracing/Logger.cpp @@ -1,37 +1,9 @@ -// ANNA - Anna is Not 'N' Anymore -// -// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo -// -// https://bitbucket.org/testillano/anna -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Authors: eduardo.ramos.testillano@gmail.com -// cisco.tierra@gmail.com +// ANNA - Anna is Not Nothingness Anymore // +// // +// (c) Copyright 2005-2015 Eduardo Ramos Testillano & Francisco Ruiz Rayo // +// // +// See project site at http://redmine.teslayout.com/projects/anna-suite // +// See accompanying file LICENSE or copy at http://www.teslayout.com/projects/public/anna.LICENSE // #include @@ -60,7 +32,7 @@ Logger::Level Logger::st_level(Logger::Warning); NRMutex Logger::st_mutex; void Logger::initialize(const char* ident) -throw() { +{ if(st_writer == NULL) { st_writer = new TraceLogger; st_writer->initialize(ident); @@ -68,7 +40,7 @@ throw() { } void Logger::initialize(const char* ident, Writer* writer) -throw() { +{ if(st_writer == NULL && writer != NULL) { writer->initialize(ident); st_writer = writer; @@ -76,7 +48,7 @@ throw() { } void Logger::showPID(const bool show) -throw() { +{ #ifndef _MT if(show == true) { @@ -89,7 +61,7 @@ throw() { } void Logger::write(const Level level, const char* text, const char* fromFile, const int fromLine) -throw() { +{ #ifndef _MT if(isActive(level) && st_writer != NULL) { @@ -108,7 +80,7 @@ throw() { } void Logger::write(const Level level, const char* text, const char* value, const char* fromFile, const int fromLine) -throw() { +{ #ifndef _MT if(isActive(level) && st_writer != NULL) { @@ -127,7 +99,7 @@ throw() { } void Logger::write(const Level level, const char* text, const int value, const char* fromFile, const int fromLine) -throw() { +{ #ifndef _MT if(isActive(level) && st_writer != NULL) { @@ -146,7 +118,7 @@ throw() { } void Logger::write(const Level level, const char* text, const DataBlock& value, const char* fromFile, const int fromLine) -throw() { +{ if(isActive(level) && st_writer != NULL) { #ifndef _MT @@ -169,21 +141,21 @@ throw() { } void Logger::disable() -throw(RuntimeException) { +noexcept(false) { st_mutex.lock(); st_enabled = false; st_mutex.unlock(); } void Logger::enable() -throw(RuntimeException) { +noexcept(false) { st_mutex.lock(); st_enabled = true; st_mutex.unlock(); } Logger::Level Logger::asLevel(const char* stringLevel) -throw(RuntimeException) { +noexcept(false) { static struct { const char* stringLevel; const Level level; @@ -220,7 +192,7 @@ throw(RuntimeException) { } const char* Logger::asString(const Level level) -throw() { +{ static const char* levels [] = { "Emergency", "Alert", "Critical", "Error", "Warning", "Notice", "Information", "Debug" };