X-Git-Url: https://vaikene.ee/gitweb/pswgen11.html?a=blobdiff_plain;ds=sidebyside;f=src%2Flibs%2FCommon%2Filogger.h;h=4d865c9ee6ed6d741dc2ede6eb8645402c56e811;hb=refs%2Fheads%2Fqt5;hp=ecc4858bb8d4a11330b026858de7c6ed411786cc;hpb=441d1b38e0900f56891f495a94a08dc8d48e0a32;p=evaf
diff --git a/src/libs/Common/ilogger.h b/src/libs/Common/ilogger.h
index ecc4858..4d865c9 100644
--- a/src/libs/Common/ilogger.h
+++ b/src/libs/Common/ilogger.h
@@ -3,7 +3,7 @@
* @brief Logger interface for eVaf
* @author Enar Vaikene
*
- * Copyright (c) 2011 Enar Vaikene
+ * Copyright (c) 2011-2012 Enar Vaikene
*
* This file is part of the eVaf C++ cross-platform application development framework.
*
@@ -62,7 +62,8 @@ public:
Error, ///< Unexpected issues in the software that could be solved automatically.
Warning, ///< Expected issues in the software that will be solved automatically.
Info, ///< General information output by the application or modules.
- Debug ///< Information for debugging purposes.
+ Debug, ///< Information for debugging purposes.
+ Count ///< Number of severity levels
};
/// Interface constructor
@@ -79,7 +80,7 @@ public:
* are expected to be linked against the Common library, then this is the preferred method of obtaining
* the iLogger interface. The other method is by using the iRegistry interface.
*/
- static iLogger::instance();
+ static iLogger * instance();
/**
* Returns the current default source name.
@@ -92,6 +93,8 @@ public:
*
* Use the setDefaultSource() function to change the default source name. If not set, then
* uses the default source name "common".
+ *
+ * Changing the name of the default source resets any other settings set for the default source.
*/
virtual void setDefaultSource(QString const & source) = 0;
@@ -99,7 +102,7 @@ public:
* Returns the current severity level
* @param source Name of the source or default if omitted.
*/
- virtual Severity severity(QString const & source = 0) const = 0;
+ virtual Severity severity(QString const & source = 0) = 0;
/**
* Changes the current severity level.
@@ -110,13 +113,13 @@ public:
* are output. With this function the severity level can be changed so that also less important
* messages are output.
*/
- virtual void setSeverity(Severity severity, QString const & source) = 0;
+ virtual void setSeverity(Severity severity, QString const & source = 0) = 0;
/**
* Returns the current maximum size of log files in KiB.
* @param source Name of the source or default if omitted.
*/
- virtual uint maxSize(QString const & source = 0) const = 0;
+ virtual uint maxSize(QString const & source = 0) = 0;
/**
* Changes the maximum size of log files for the given source
@@ -136,7 +139,7 @@ public:
* Returns the maximum number of log files.
* @param source Name of the source or default if omitted.
*/
- virtual uint maxCount(QString const & source = 0) const = 0;
+ virtual uint maxCount(QString const & source = 0) = 0;
/**
* Changes the maximum number of log files
@@ -226,22 +229,110 @@ public:
*/
virtual FatalMsgHandler installFatalMsgHandler(FatalMsgHandler newHandler) = 0;
+
+signals:
+
+ /**
+ * Logger event signal
+ * @param severity Severity of the message
+ * @param text The message
+ * @param source Source of the message
+ * @param where Where the message was output
+ *
+ * This signal is emitted for every message output with the iLogger interface. Connect
+ * your receiver to this signal if you want to add your own message handling. For example,
+ * use this signal to show messages in a log window etc.
+ */
+ void loggerEvent(Common::iLogger::Severity severity, QString const & text, QString const & source, QString const & where);
+
};
} // namespace eVaf::Common
} // namespace eVaf
/**
- * Outputs info messages
- * @param msg The format string
- * @param ... Variable list of arguments
+ * Macro for fatal error messages.
*
- * The qInfo() function adds info messages to the Qt family of functions qDebug(), qWarning(), qError() and qFatal().
+ * This macro expands to a fatal error message output with the location in the source code where the error
+ * occurred.
*/
-void COMMON_EXPORT qInfo(char const * const msg, ...)
-#ifdef Q_OS_LINUX
- __attribute__((format(printf, 1, 2)))
+#define EVAF_FATAL_ERROR(...) \
+ do { \
+ eVaf::Common::iLogger::instance()->write( \
+ eVaf::Common::iLogger::Fatal, \
+ eVaf::Common::iLogger::instance()->printf(__VA_ARGS__), \
+ 0, \
+ eVaf::Common::iLogger::instance()->printf("%s:%s:%d", __FILE__, __FUNCTION__, __LINE__) \
+ ); \
+ } while (0)
+
+/**
+ * Macro for error messages.
+ *
+ * This macro expands to an error message output with the location in the source code where the error
+ * occurred.
+ */
+#define EVAF_ERROR(...) \
+ do { \
+ eVaf::Common::iLogger::instance()->write( \
+ eVaf::Common::iLogger::Error, \
+ eVaf::Common::iLogger::instance()->printf(__VA_ARGS__), \
+ 0, \
+ eVaf::Common::iLogger::instance()->printf("%s:%s:%d", __FILE__, __FUNCTION__, __LINE__) \
+ ); \
+ } while (0)
+
+/**
+ * Macro for warning messages.
+ *
+ * This macro expands to a warning message output with the location in the source code where the warning
+ * occurred.
+ */
+#define EVAF_WARNING(...) \
+ do { \
+ eVaf::Common::iLogger::instance()->write( \
+ eVaf::Common::iLogger::Warning, \
+ eVaf::Common::iLogger::instance()->printf(__VA_ARGS__), \
+ 0, \
+ eVaf::Common::iLogger::instance()->printf("%s:%s:%d", __FILE__, __FUNCTION__, __LINE__) \
+ ); \
+ } while (0)
+
+/**
+ * Macro for info messages.
+ *
+ * This macro expands to an info message output with the location in the source code where the message
+ * is output.
+ */
+#define EVAF_INFO(...) \
+ do { \
+ eVaf::Common::iLogger::instance()->write( \
+ eVaf::Common::iLogger::Info, \
+ eVaf::Common::iLogger::instance()->printf(__VA_ARGS__), \
+ 0, \
+ eVaf::Common::iLogger::instance()->printf("%s:%s:%d", __FILE__, __FUNCTION__, __LINE__) \
+ ); \
+ } while (0)
+
+/**
+ * Macro for debug messages.
+ *
+ * This macro expands to a debug message output with the location in the source code where the message
+ * is output. All the debug messages are supressed when the NDEBUG directive is defined.
+ */
+#ifndef NDEBUG
+# define EVAF_DEBUG(...) \
+ do { \
+ eVaf::Common::iLogger::instance()->write( \
+ eVaf::Common::iLogger::Debug, \
+ eVaf::Common::iLogger::instance()->printf(__VA_ARGS__), \
+ 0, \
+ eVaf::Common::iLogger::instance()->printf("%s:%s:%d", __FILE__, __FUNCTION__, __LINE__) \
+ ); \
+ } while (0)
+#else
+# define EVAF_DEBUG(...) \
+ do { } while (0)
#endif
-;
#endif // ilogger.h