Merge pull request #3540 from kumpera/abort-on-gerror

[logging] Fix g_error not aborting.

Once we enabled g_log redirection, we stopped aborting as the new handlers didn't behave like eglib.

diff --git a/mono/utils/mono-log-common.c b/mono/utils/mono-log-common.c
index cf73d9acbb84cbcafc5328dc5fb6b3b6f9975e50..4948b91b80fbd84435428d56098e47d751d3b2a0 100644 (file)
--- a/mono/utils/mono-log-common.c
+++ b/mono/utils/mono-log-common.c
@@ -132,7 +132,7 @@ mono_log_write_logfile (const char *log_domain, GLogLevelFlags level, mono_bool
 
        fflush(logFile);
 
-       if (level == G_LOG_FLAG_FATAL)
+       if (level & G_LOG_LEVEL_ERROR)
                abort();
 }
 

diff --git a/mono/utils/mono-log-posix.c b/mono/utils/mono-log-posix.c
index 388fd26202f6c5f4b2b936b6bf81592d6ed0d049..6d25d3a6117b7cc4237bc10c8c6ef9e1e67cec3d 100644 (file)
--- a/mono/utils/mono-log-posix.c
+++ b/mono/utils/mono-log-posix.c
@@ -84,7 +84,7 @@ mono_log_write_syslog(const char *domain, GLogLevelFlags level, mono_bool hdr, c
 {
        syslog (mapSyslogLevel(level), "%s", message);
 
-       if (level == G_LOG_FLAG_FATAL)
+       if (level & G_LOG_LEVEL_ERROR)
                abort();
 }
 

diff --git a/mono/utils/mono-log-windows.c b/mono/utils/mono-log-windows.c
index d0ee01994371e00665dcea0f29e18634b377a66d..f6cd987fbba85c31ebda11b966b220ef3067f7ac 100644 (file)
--- a/mono/utils/mono-log-windows.c
+++ b/mono/utils/mono-log-windows.c
@@ -104,7 +104,7 @@ mono_log_write_syslog(const char *domain, GLogLevelFlags level, mono_bool hdr, c
 
        fflush(logFile);
 
-       if (level == G_LOG_FLAG_FATAL)
+       if (level & G_LOG_LEVEL_ERROR)
                abort();
 }