@@ -18,6 +18,7 @@ import java.util.concurrent.Executors
1818
1919object Logger {
2020 private const val TAG = " APP"
21+ private const val COMPACT = false
2122
2223 private val singleThreadDispatcher = Executors
2324 .newSingleThreadExecutor { Thread (it, " bitkit.log" ).apply { priority = Thread .NORM_PRIORITY - 1 } }
@@ -69,9 +70,9 @@ object Logger {
6970 file : String = getCallerFile(),
7071 line : Int = getCallerLine(),
7172 ) {
72- val errMsg = e?.message?. let { " (err: ' $it ') " } ? : " "
73- val message = format(" WARN⚠️: $msg$errMsg " , context, file, line)
74- Log .w(TAG , message, e)
73+ val errMsg = e?.let { " [ ${e:: class .simpleName} =' ${e.message} '] " }.orEmpty()
74+ val message = format(" WARN⚠️: $msg $errMsg " , context, file, line)
75+ if ( COMPACT ) Log .w( TAG , message) else Log .w(TAG , message, e)
7576 saveToFile(message)
7677 }
7778
@@ -82,9 +83,9 @@ object Logger {
8283 file : String = getCallerFile(),
8384 line : Int = getCallerLine(),
8485 ) {
85- val errMsg = e?.message?. let { " (err: ' $it ') " } ? : " "
86- val message = format(" ERROR❌️: $msg$errMsg " , context, file, line)
87- Log .e(TAG , message, e)
86+ val errMsg = e?.let { " [ ${e:: class .simpleName} =' ${e.message} '] " }.orEmpty()
87+ val message = format(" ERROR❌️: $msg $errMsg " , context, file, line)
88+ if ( COMPACT ) Log .e( TAG , message) else Log .e(TAG , message, e)
8889 saveToFile(message)
8990 }
9091
@@ -110,8 +111,10 @@ object Logger {
110111 saveToFile(message)
111112 }
112113
113- private fun format (message : Any , context : String , file : String , line : Int ): String {
114- return " $message ${if (context.isNotEmpty()) " - $context " else " " } [$file :$line ]"
114+ private fun format (message : String , context : String , file : String , line : Int ): String {
115+ val message = message.trim()
116+ val context = if (context.isNotEmpty()) " - $context " else " "
117+ return " $message$context [$file :$line ]"
115118 }
116119
117120 private fun getCallerFile (): String {
0 commit comments