Skip to content
Snippets Groups Projects
Commit 4a3ae4e5 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Improved loggability handling

parent df36ffab
No related branches found
No related tags found
No related merge requests found
...@@ -58,8 +58,6 @@ class MainActivity : ServiceBoundActivity() { ...@@ -58,8 +58,6 @@ class MainActivity : ServiceBoundActivity() {
private val dateTimeFormatter: DateTimeFormatter = DateTimeFormatter.ISO_TIME private val dateTimeFormatter: DateTimeFormatter = DateTimeFormatter.ISO_TIME
private val handler = object : LoggingHandler() { private val handler = object : LoggingHandler() {
override fun log(logLevel: LogLevel, tag: String, message: String?, throwable: Throwable?) { override fun log(logLevel: LogLevel, tag: String, message: String?, throwable: Throwable?) {
if (logLevel.ordinal < LogLevel.INFO.ordinal)
return
val time = dateTimeFormatter.format(ZonedDateTime.now(ZoneOffset.UTC)) val time = dateTimeFormatter.format(ZonedDateTime.now(ZoneOffset.UTC))
runOnUiThread { runOnUiThread {
errorList.append("$time $tag: ") errorList.append("$time $tag: ")
...@@ -74,7 +72,8 @@ class MainActivity : ServiceBoundActivity() { ...@@ -74,7 +72,8 @@ class MainActivity : ServiceBoundActivity() {
} }
} }
override fun isLoggable(logLevel: LogLevel, tag: String) = true override fun isLoggable(logLevel: LogLevel, tag: String)
= (logLevel.ordinal >= LogLevel.INFO.ordinal)
} }
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
......
...@@ -37,9 +37,9 @@ abstract class LoggingHandler { ...@@ -37,9 +37,9 @@ abstract class LoggingHandler {
inline fun log(logLevel: LoggingHandler.LogLevel, tag: String, message: String? = null, inline fun log(logLevel: LoggingHandler.LogLevel, tag: String, message: String? = null,
throwable: Throwable? = null) { throwable: Throwable? = null) {
for (it in LoggingHandler.loggingHandlers) { LoggingHandler.loggingHandlers
it.log(logLevel, tag, message, throwable) .filter { it.isLoggable(logLevel, tag) }
} .forEach { it.log(logLevel, tag, message, throwable) }
} }
inline fun log(logLevel: LoggingHandler.LogLevel, tag: String, throwable: Throwable? = null) inline fun log(logLevel: LoggingHandler.LogLevel, tag: String, throwable: Throwable? = null)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment