OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-29 16:40:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

#12329 Simplify interface for log messages

Browse Source
This commit is contained in:
Magne Sjaastad committed 2025-04-08 14:26:04 +02:00
1 parent 60d2bf0483
commit 380f559f0d
7 files changed
+77 -82
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/Application/RiaPreferencesSystem.cpp
+2
View File
@@ -230,6 +230,8 @@ RiaPreferencesSystem::EclipseTextFileReaderMode RiaPreferencesSystem::eclipseTex
//--------------------------------------------------------------------------------------------------
bool RiaPreferencesSystem::isLoggingActivatedForKeyword( const QString& keyword ) const
{
if ( keyword.isEmpty() ) return true;
QStringList keywords = m_keywordsForLogging().split( ";" );
if ( keywords.contains( "enable-all" ) ) return true;
ApplicationLibCode/Application/Tools/RiaLogging.cpp
+13 -4
View File
@@ -18,6 +18,7 @@
#include "RiaLogging.h"
#include "RiaGuiApplication.h"
#include "RiaPreferencesSystem.h"
#include "RiaRegressionTestRunner.h"
#include <iostream>
@@ -245,8 +246,10 @@ RILogLevel RiaLogging::logLevelBasedOnPreferences()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaLogging::error( const QString& message )
void RiaLogging::error( const QString& message, const QString logKeyword )
{
if ( !RiaPreferencesSystem::current()->isLoggingActivatedForKeyword( logKeyword ) ) return;
if ( isSameMessage( message ) ) return;
for ( const auto& logger : sm_logger )
@@ -264,8 +267,10 @@ void RiaLogging::error( const QString& message )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaLogging::warning( const QString& message )
void RiaLogging::warning( const QString& message, const QString logKeyword )
{
if ( !RiaPreferencesSystem::current()->isLoggingActivatedForKeyword( logKeyword ) ) return;
if ( isSameMessage( message ) ) return;
for ( const auto& logger : sm_logger )
@@ -283,8 +288,10 @@ void RiaLogging::warning( const QString& message )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaLogging::info( const QString& message )
void RiaLogging::info( const QString& message, const QString logKeyword )
{
if ( !RiaPreferencesSystem::current()->isLoggingActivatedForKeyword( logKeyword ) ) return;
if ( isSameMessage( message ) ) return;
for ( const auto& logger : sm_logger )
@@ -302,8 +309,10 @@ void RiaLogging::info( const QString& message )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaLogging::debug( const QString& message )
void RiaLogging::debug( const QString& message, const QString logKeyword )
{
if ( !RiaPreferencesSystem::current()->isLoggingActivatedForKeyword( logKeyword ) ) return;
if ( isSameMessage( message ) ) return;
for ( const auto& logger : sm_logger )
ApplicationLibCode/Application/Tools/RiaLogging.h
+6 -5
View File
@@ -23,7 +23,8 @@
#include <string>
#include <vector>
class QString;
#include <QString>
class QWidget;
enum class RILogLevel
@@ -66,10 +67,10 @@ public:
static RILogLevel logLevelBasedOnPreferences();
static void error( const QString& message );
static void warning( const QString& message );
static void info( const QString& message );
static void debug( const QString& message );
static void error( const QString& message, const QString logKeyword = "" );
static void warning( const QString& message, const QString logKeyword = "" );
static void info( const QString& message, const QString logKeyword = "" );
static void debug( const QString& message, const QString logKeyword = "" );
static void errorInMessageBox( QWidget* parent, const QString& title, const QString& text );