projects
/
anna.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix local server for multiple applications
[anna.git]
/
source
/
core
/
tracing
/
Logger.cpp
diff --git
a/source/core/tracing/Logger.cpp
b/source/core/tracing/Logger.cpp
index
608b927
..
c8b7ec4
100644
(file)
--- a/
source/core/tracing/Logger.cpp
+++ b/
source/core/tracing/Logger.cpp
@@
-32,7
+32,7
@@
Logger::Level Logger::st_level(Logger::Warning);
NRMutex Logger::st_mutex;
void Logger::initialize(const char* ident)
NRMutex Logger::st_mutex;
void Logger::initialize(const char* ident)
-
throw()
{
+{
if(st_writer == NULL) {
st_writer = new TraceLogger;
st_writer->initialize(ident);
if(st_writer == NULL) {
st_writer = new TraceLogger;
st_writer->initialize(ident);
@@
-40,7
+40,7
@@
throw() {
}
void Logger::initialize(const char* ident, Writer* writer)
}
void Logger::initialize(const char* ident, Writer* writer)
-
throw()
{
+{
if(st_writer == NULL && writer != NULL) {
writer->initialize(ident);
st_writer = writer;
if(st_writer == NULL && writer != NULL) {
writer->initialize(ident);
st_writer = writer;
@@
-48,7
+48,7
@@
throw() {
}
void Logger::showPID(const bool show)
}
void Logger::showPID(const bool show)
-
throw()
{
+{
#ifndef _MT
if(show == true) {
#ifndef _MT
if(show == true) {
@@
-61,7
+61,7
@@
throw() {
}
void Logger::write(const Level level, const char* text, const char* fromFile, const int fromLine)
}
void Logger::write(const Level level, const char* text, const char* fromFile, const int fromLine)
-
throw()
{
+{
#ifndef _MT
if(isActive(level) && st_writer != NULL) {
#ifndef _MT
if(isActive(level) && st_writer != NULL) {
@@
-80,7
+80,7
@@
throw() {
}
void Logger::write(const Level level, const char* text, const char* value, const char* fromFile, const int fromLine)
}
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) {
#ifndef _MT
if(isActive(level) && st_writer != NULL) {
@@
-99,7
+99,7
@@
throw() {
}
void Logger::write(const Level level, const char* text, const int value, const char* fromFile, const int fromLine)
}
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) {
#ifndef _MT
if(isActive(level) && st_writer != NULL) {
@@
-118,7
+118,7
@@
throw() {
}
void Logger::write(const Level level, const char* text, const DataBlock& value, const char* fromFile, const int fromLine)
}
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
if(isActive(level) && st_writer != NULL) {
#ifndef _MT
@@
-141,21
+141,21
@@
throw() {
}
void Logger::disable()
}
void Logger::disable()
-
throw(RuntimeException
) {
+
noexcept(false
) {
st_mutex.lock();
st_enabled = false;
st_mutex.unlock();
}
void Logger::enable()
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)
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;
static struct {
const char* stringLevel;
const Level level;
@@
-192,7
+192,7
@@
throw(RuntimeException) {
}
const char* Logger::asString(const Level level)
}
const char* Logger::asString(const Level level)
-
throw()
{
+{
static const char* levels [] = {
"Emergency", "Alert", "Critical", "Error", "Warning", "Notice", "Information", "Debug"
};
static const char* levels [] = {
"Emergency", "Alert", "Critical", "Error", "Warning", "Notice", "Information", "Debug"
};