mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2025-03-01 10:33:28 +00:00
05d24b99c4
* Refactor to fix #1671 * Add GUI/NonGUI mode to info page * Do not show lock config, if in non-UI mode * Updae Changelog * Correct includes * Ensure key member initialization - RGB Channels * Ensure key member initialization - WebServer * Update RGBChannels * Fix initialization order * Fix key when inserting new logger in LoggerMap, Prepare logBuffer-JSON snapshot view in LoggerManager, Increase buffered loglines to 500 * Fix Memory leak in GrabberWrapper * Fix Memory leak in BlackBorderProcessor * Fix Memory leak in BlackBorderProcessor * use ninja generator under macos * Fix BGEffectHandler destruction * Fix Mdns code * Clear list after applying qDeleteAll * Fix deletion of CecHandler * Fix memory leak caused by wrong buffer allocation * Remove extra pixel consistently * Change mDNS to Qt SmartPointers * Correct removal * Fix usage of _width/_height (they are the output resolution, not the screen resolution) That avoids unnecessary resizing of the output image with every transferFrame call * Move main non Thread Objects to Smart Pointers * Revert "Move main non Thread Objects to Smart Pointers" This reverts commit 26102ca963982e2fbc4ffb8d4db6139f0128a3cc. * Add missing deletes * Revert MdnsBrowser chnage * Revert MdnsBrowser change * Fix memory leaks related standalone grabber * Address CodeQL finding * delete pointer OsxFrameGrabber --------- Co-authored-by: Paulchen-Panther <16664240+Paulchen-Panther@users.noreply.github.com>
127 lines
3.6 KiB
C++
127 lines
3.6 KiB
C++
#pragma once
|
|
|
|
// QT includes
|
|
#include <QObject>
|
|
#include <QString>
|
|
#include <QMap>
|
|
#include <QAtomicInteger>
|
|
#include <QList>
|
|
#include <QJsonArray>
|
|
|
|
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
|
|
#include <QRecursiveMutex>
|
|
#else
|
|
#include <QMutex>
|
|
#endif
|
|
|
|
// stl includes
|
|
#ifdef _WIN32
|
|
#include <stdexcept>
|
|
#endif
|
|
|
|
#include <utils/global_defines.h>
|
|
|
|
#define LOG_MESSAGE(severity, logger, ...) (logger)->Message(severity, __FILE__, __FUNCTION__, __LINE__, __VA_ARGS__)
|
|
|
|
// standard log messages
|
|
#define Debug(logger, ...) LOG_MESSAGE(Logger::DEBUG , logger, __VA_ARGS__)
|
|
#define Info(logger, ...) LOG_MESSAGE(Logger::INFO , logger, __VA_ARGS__)
|
|
#define Warning(logger, ...) LOG_MESSAGE(Logger::WARNING, logger, __VA_ARGS__)
|
|
#define Error(logger, ...) LOG_MESSAGE(Logger::ERRORR , logger, __VA_ARGS__)
|
|
|
|
// conditional log messages
|
|
#define DebugIf(condition, logger, ...) if (condition) Debug(logger, __VA_ARGS__)
|
|
#define InfoIf(condition, logger, ...) if (condition) Info(logger, __VA_ARGS__)
|
|
#define WarningIf(condition, logger, ...) if (condition) Warning(logger, __VA_ARGS__)
|
|
#define ErrorIf(condition, logger, ...) if (condition) Error(logger, __VA_ARGS__)
|
|
|
|
// ================================================================
|
|
|
|
class Logger : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
enum LogLevel {
|
|
UNSET = 0,
|
|
DEBUG = 1,
|
|
INFO = 2,
|
|
WARNING = 3,
|
|
ERRORR = 4,
|
|
OFF = 5
|
|
};
|
|
|
|
struct T_LOG_MESSAGE
|
|
{
|
|
QString loggerName;
|
|
QString loggerSubName;
|
|
QString function;
|
|
unsigned int line;
|
|
QString fileName;
|
|
qint64 utime;
|
|
QString message;
|
|
LogLevel level;
|
|
QString levelString;
|
|
};
|
|
|
|
static Logger* getInstance(const QString & name = "", const QString & subName = "__", LogLevel minLevel=Logger::INFO);
|
|
static void deleteInstance(const QString & name = "", const QString & subName = "__");
|
|
static void setLogLevel(LogLevel level, const QString & name = "", const QString & subName = "__");
|
|
static LogLevel getLogLevel(const QString & name = "", const QString & subName = "__");
|
|
|
|
void Message(LogLevel level, const char* sourceFile, const char* func, unsigned int line, const char* fmt, ...);
|
|
void setMinLevel(LogLevel level) { _minLevel = static_cast<int>(level); }
|
|
LogLevel getMinLevel() const { return static_cast<LogLevel>(int(_minLevel)); }
|
|
QString getName() const { return _name; }
|
|
QString getSubName() const { return _subName; }
|
|
|
|
signals:
|
|
void newLogMessage(Logger::T_LOG_MESSAGE);
|
|
|
|
protected:
|
|
Logger(const QString & name="", const QString & subName = "__", LogLevel minLevel = INFO);
|
|
~Logger() override;
|
|
|
|
private:
|
|
void write(const Logger::T_LOG_MESSAGE & message);
|
|
|
|
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
|
|
static QRecursiveMutex MapLock;
|
|
#else
|
|
static QMutex MapLock;
|
|
#endif
|
|
static QMap<QString,Logger*> LoggerMap;
|
|
static QAtomicInteger<int> GLOBAL_MIN_LOG_LEVEL;
|
|
|
|
const QString _name;
|
|
const QString _subName;
|
|
const bool _syslogEnabled;
|
|
const unsigned _loggerId;
|
|
|
|
/* Only non-const member, hence the atomic */
|
|
QAtomicInteger<int> _minLevel;
|
|
};
|
|
|
|
class LoggerManager : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
static LoggerManager* getInstance();
|
|
|
|
public slots:
|
|
void handleNewLogMessage(const Logger::T_LOG_MESSAGE&);
|
|
QJsonArray getLogMessageBuffer(Logger::LogLevel filter=Logger::UNSET) const;
|
|
|
|
signals:
|
|
void newLogMessage(const Logger::T_LOG_MESSAGE&);
|
|
|
|
private:
|
|
LoggerManager();
|
|
|
|
QList<Logger::T_LOG_MESSAGE> _logMessageBuffer;
|
|
const int _loggerMaxMsgBufferSize;
|
|
};
|
|
|
|
Q_DECLARE_METATYPE(Logger::T_LOG_MESSAGE)
|