summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Common/Backends/ConsoleLogger.cpp33
-rw-r--r--src/Common/Backends/ConsoleLogger.h41
-rw-r--r--src/Common/Backends/FileLogger.cpp32
-rw-r--r--src/Common/Backends/FileLogger.h46
-rw-r--r--src/Common/Backends/Makefile.am4
-rw-r--r--src/Common/Backends/Makefile.in9
-rw-r--r--src/Common/Logger.cpp50
-rw-r--r--src/Common/Logger.h64
-rw-r--r--src/Common/Makefile.am2
-rw-r--r--src/Common/Makefile.in5
10 files changed, 234 insertions, 52 deletions
diff --git a/src/Common/Backends/ConsoleLogger.cpp b/src/Common/Backends/ConsoleLogger.cpp
new file mode 100644
index 0000000..180a009
--- /dev/null
+++ b/src/Common/Backends/ConsoleLogger.cpp
@@ -0,0 +1,33 @@
+/*
+ * ConsoleLogger.cpp
+ *
+ * Copyright (C) 2008 Johannes Thorn <dante@g4t3.de>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ConsoleLogger.h"
+#include <iostream>
+
+namespace Mad {
+namespace Common {
+namespace Backends {
+
+void ConsoleLogger::logMessage(MessageLevel level, const std::string &message) {
+ std::cerr << message << std::endl;
+}
+
+}
+}
+}
diff --git a/src/Common/Backends/ConsoleLogger.h b/src/Common/Backends/ConsoleLogger.h
new file mode 100644
index 0000000..f55d7ba
--- /dev/null
+++ b/src/Common/Backends/ConsoleLogger.h
@@ -0,0 +1,41 @@
+/*
+ * ConsoleLogger.h
+ *
+ * Copyright (C) 2008 Johannes Thorn <dante@g4t3.de>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MAD_COMMON_BACKENDS_CONSOLELOGGER_H_
+#define MAD_COMMON_BACKENDS_CONSOLELOGGER_H_
+
+#include "../Logger.h"
+
+namespace Mad {
+namespace Common {
+namespace Backends {
+
+class ConsoleLogger : public Logger {
+ protected:
+ virtual void logMessage(MessageLevel level, const std::string &message);
+
+ public:
+ ConsoleLogger() {}
+};
+
+}
+}
+}
+
+#endif /* MAD_COMMON_BACKENDS_CONSOLELOGGER_H_ */
diff --git a/src/Common/Backends/FileLogger.cpp b/src/Common/Backends/FileLogger.cpp
new file mode 100644
index 0000000..079c08c
--- /dev/null
+++ b/src/Common/Backends/FileLogger.cpp
@@ -0,0 +1,32 @@
+/*
+ * FileLogger.cpp
+ *
+ * Copyright (C) 2008 Johannes Thorn <dante@g4t3.de>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "FileLogger.h"
+
+namespace Mad {
+namespace Common {
+namespace Backends {
+
+void FileLogger::logMessage(MessageLevel level, const std::string &message) {
+ file << message << std::endl;
+}
+
+}
+}
+}
diff --git a/src/Common/Backends/FileLogger.h b/src/Common/Backends/FileLogger.h
new file mode 100644
index 0000000..219a464
--- /dev/null
+++ b/src/Common/Backends/FileLogger.h
@@ -0,0 +1,46 @@
+/*
+ * FileLogger.h
+ *
+ * Copyright (C) 2008 Johannes Thorn <dante@g4t3.de>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MAD_COMMON_BACKENDS_FILELOGGER_H_
+#define MAD_COMMON_BACKENDS_FILELOGGER_H_
+
+#include "../Logger.h"
+#include <fstream>
+
+namespace Mad {
+namespace Common {
+namespace Backends {
+
+class FileLogger : public Logger {
+ private:
+ std::ofstream file;
+
+ protected:
+ virtual void logMessage(MessageLevel level, const std::string &message);
+
+ public:
+ FileLogger(const std::string &filename)
+ : file(filename.c_str(), std::ios_base::out|std::ios_base::app) {}
+};
+
+}
+}
+}
+
+#endif /* MAD_COMMON_BACKENDS_FILELOGGER_H_ */
diff --git a/src/Common/Backends/Makefile.am b/src/Common/Backends/Makefile.am
index aa705d8..5a6e325 100644
--- a/src/Common/Backends/Makefile.am
+++ b/src/Common/Backends/Makefile.am
@@ -1,5 +1,5 @@
noinst_LTLIBRARIES = libbackends.la
-libbackends_la_SOURCES = SystemBackendProc.cpp
+libbackends_la_SOURCES = ConsoleLogger.cpp FileLogger.cpp SystemBackendProc.cpp
-noinst_HEADERS = SystemBackendProc.h
+noinst_HEADERS = ConsoleLogger.h FileLogger.h SystemBackendProc.h
diff --git a/src/Common/Backends/Makefile.in b/src/Common/Backends/Makefile.in
index 4f684e8..d943c5e 100644
--- a/src/Common/Backends/Makefile.in
+++ b/src/Common/Backends/Makefile.in
@@ -45,7 +45,8 @@ CONFIG_HEADER = $(top_builddir)/src/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libbackends_la_LIBADD =
-am_libbackends_la_OBJECTS = SystemBackendProc.lo
+am_libbackends_la_OBJECTS = ConsoleLogger.lo FileLogger.lo \
+ SystemBackendProc.lo
libbackends_la_OBJECTS = $(am_libbackends_la_OBJECTS)
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -186,8 +187,8 @@ target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
noinst_LTLIBRARIES = libbackends.la
-libbackends_la_SOURCES = SystemBackendProc.cpp
-noinst_HEADERS = SystemBackendProc.h
+libbackends_la_SOURCES = ConsoleLogger.cpp FileLogger.cpp SystemBackendProc.cpp
+noinst_HEADERS = ConsoleLogger.h FileLogger.h SystemBackendProc.h
all: all-am
.SUFFIXES:
@@ -239,6 +240,8 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ConsoleLogger.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FileLogger.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SystemBackendProc.Plo@am__quote@
.cpp.o:
diff --git a/src/Common/Logger.cpp b/src/Common/Logger.cpp
index 66fffd6..dc6c53c 100644
--- a/src/Common/Logger.cpp
+++ b/src/Common/Logger.cpp
@@ -1,44 +1,32 @@
/*
* Logger.cpp
*
- * Created on: 10.09.2008
- * Author: dante
+ * Copyright (C) 2008 Johannes Thorn <dante@g4t3.de>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "Logger.h"
-#include <iostream>
namespace Mad {
namespace Common {
-void Logger::printMessage(MessageType typeOfMessage, std::string message) {
- switch(typeOfMessage) {
- case CRITICAL:
- std::cout << "CRITICAL: " << message << std::endl;
- break;
- case ERROR:
- std::cout << "ERROR: " << message << std::endl;
- break;
- case WARNING:
- std::cout << "WARNING: " << message << std::endl;
- break;
- case VERBOSE:
- std::cout << "MESSAGE: " << message << std::endl;
- break;
- case DEBUG:
- std::cout << "DEBUG: " << message << std::endl;
- break;
- default:
- std::cout << "MESSAGE: " << message << std::endl;
- }
-}
-
-Logger::Logger(int type) {
- this->loggingType = type;
-}
-
-Logger::~Logger() {
- // TODO Auto-generated destructor stub
+void Logger::log(MessageLevel level, const std::string &message) {
+ for(std::list<Logger*>::iterator logger = loggers.begin(); logger != loggers.end(); ++logger) {
+ if((*logger)->getLevel() >= level)
+ (*logger)->logMessage(level, message);
+ }
}
}
diff --git a/src/Common/Logger.h b/src/Common/Logger.h
index 928e65c..465ae00 100644
--- a/src/Common/Logger.h
+++ b/src/Common/Logger.h
@@ -1,29 +1,69 @@
/*
* Logger.h
*
- * Created on: 10.09.2008
- * Author: dante
+ * Copyright (C) 2008 Johannes Thorn <dante@g4t3.de>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MAD_COMMON_LOGGER_H_
#define MAD_COMMON_LOGGER_H_
+#include <algorithm>
+#include <list>
#include <string>
namespace Mad {
namespace Common {
class Logger {
- //TODO Enum type mit unterschiedlichen Stufen
- private:
- int loggingType;
- public:
- enum MessageType {
- CRITICAL, ERROR, WARNING, DEFAULT, VERBOSE, DEBUG
- };
- void printMessage(MessageType typeOfMessage, std::string message);
- Logger(int type);
- virtual ~Logger();
+ public:
+ enum MessageLevel {
+ CRITICAL, ERROR, WARNING, DEFAULT, VERBOSE, DEBUG
+ };
+
+ private:
+ static std::list<Logger*> loggers;
+ MessageLevel level;
+
+ protected:
+ Logger() : level(DEFAULT) {}
+
+ virtual void logMessage(MessageLevel level, const std::string &message) = 0;
+
+ public:
+ static void log(MessageLevel level, const std::string &message);
+
+ static void registerLogger(Logger *logger) {
+ loggers.push_back(logger);
+ }
+
+ static void unregisterLogger(Logger *logger) {
+ std::list<Logger*>::iterator it = std::find(loggers.begin(), loggers.end(), logger);
+ if(it != loggers.end())
+ loggers.erase(it);
+ }
+
+ MessageLevel getLevel() const {
+ return level;
+ }
+
+ void setLevel(MessageLevel newLevel) {
+ level = newLevel;
+ }
+
+ virtual ~Logger() {}
};
}
diff --git a/src/Common/Makefile.am b/src/Common/Makefile.am
index 88126c4..8ef4a34 100644
--- a/src/Common/Makefile.am
+++ b/src/Common/Makefile.am
@@ -1,7 +1,7 @@
SUBDIRS = Backends Requests RequestHandlers
noinst_LTLIBRARIES = libcommon.la
-libcommon_la_SOURCES = ConfigManager.cpp Exception.cpp Logger.cpp RequestManager.cpp SystemBackend.cpp Util.cpp
+libcommon_la_SOURCES = ConfigManager.cpp Exception.cpp RequestManager.cpp SystemBackend.cpp Util.cpp
libcommon_la_LIBADD = Backends/libbackends.la Requests/librequests.la RequestHandlers/librequesthandlers.la
noinst_HEADERS = ConfigManager.h Exception.h Logger.h Request.h RequestBase.h RequestHandler.h RequestManager.h SystemBackend.h Util.h
diff --git a/src/Common/Makefile.in b/src/Common/Makefile.in
index 9f655ee..fd88d64 100644
--- a/src/Common/Makefile.in
+++ b/src/Common/Makefile.in
@@ -46,7 +46,7 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libcommon_la_DEPENDENCIES = Backends/libbackends.la \
Requests/librequests.la RequestHandlers/librequesthandlers.la
-am_libcommon_la_OBJECTS = ConfigManager.lo Exception.lo Logger.lo \
+am_libcommon_la_OBJECTS = ConfigManager.lo Exception.lo \
RequestManager.lo SystemBackend.lo Util.lo
libcommon_la_OBJECTS = $(am_libcommon_la_OBJECTS)
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
@@ -199,7 +199,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = Backends Requests RequestHandlers
noinst_LTLIBRARIES = libcommon.la
-libcommon_la_SOURCES = ConfigManager.cpp Exception.cpp Logger.cpp RequestManager.cpp SystemBackend.cpp Util.cpp
+libcommon_la_SOURCES = ConfigManager.cpp Exception.cpp RequestManager.cpp SystemBackend.cpp Util.cpp
libcommon_la_LIBADD = Backends/libbackends.la Requests/librequests.la RequestHandlers/librequesthandlers.la
noinst_HEADERS = ConfigManager.h Exception.h Logger.h Request.h RequestBase.h RequestHandler.h RequestManager.h SystemBackend.h Util.h
all: all-recursive
@@ -255,7 +255,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ConfigManager.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Exception.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Logger.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RequestManager.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SystemBackend.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Util.Plo@am__quote@
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 14:58:54 +0100