codinux
/
fints4k
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed that message is not a FinTS message

This commit is contained in:
dankito 2021-11-12 21:32:04 +01:00
parent 7d185a805c
commit b57847b4f2
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fints4k/src/commonMain/kotlin/net/dankito/banking/fints/log/MessageLogCollector.kt
View File

@ -29,16 +29,16 @@ open class MessageLogCollector {
get() = messageLog.map { MessageLogEntry(safelyRemoveSensitiveDataFromMessage(it.message, it.bank), it.type, it.time, it.bank) } get() = messageLog.map { MessageLogEntry(safelyRemoveSensitiveDataFromMessage(it.message, it.bank), it.type, it.time, it.bank) }
protected val stackTraceHelper = StackTraceHelper() protected open val stackTraceHelper = StackTraceHelper()
open fun addMessageLog(message: String, type: MessageLogEntryType, bank: BankData) { open fun addMessageLog(message: String, type: MessageLogEntryType, bank: BankData) {
val timeStamp = Date() val timeStamp = Date()
val prettyPrintMessage = prettyPrintHbciMessage(message) val prettyPrintMessage = prettyPrintHbciMessage(message)
log.debug { "${if (type == MessageLogEntryType.Sent) "[${bank.bankCode}-${bank.customerId}] Sending" else "Received"} message:\r\n" + prettyPrintMessage }
messageLog.add(MessageLogEntry(prettyPrintMessage, type, timeStamp, bank)) messageLog.add(MessageLogEntry(prettyPrintMessage, type, timeStamp, bank))
log.debug { "${if (type == MessageLogEntryType.Sent) "[${bank.bankCode}-${bank.customerId}] Sending" else "Received"} message:\r\n" + prettyPrintMessage }
} }
protected open fun prettyPrintHbciMessage(message: String): String { protected open fun prettyPrintHbciMessage(message: String): String {
@ -47,20 +47,18 @@ open class MessageLogCollector {
open fun logError(message: String, e: Exception? = null, logger: Logger? = null, bank: BankData?) { open fun logError(message: String, e: Exception? = null, logger: Logger? = null, bank: BankData?) {
val prettyPrintMessage = prettyPrintHbciMessage(message)
val loggerToUse = logger ?: log val loggerToUse = logger ?: log
if (e != null) { if (e != null) {
loggerToUse.error(e) { prettyPrintMessage } loggerToUse.error(e) { message }
} } else {
else { loggerToUse.error(message)
loggerToUse.error(prettyPrintMessage)
} }
val errorStackTrace = if (e != null) "\r\n" + getStackTrace(e) else "" val errorStackTrace = if (e != null) "\r\n" + getStackTrace(e) else ""
// TODO: what to do when bank is not set? // TODO: what to do when bank is not set?
messageLog.add(MessageLogEntry(prettyPrintMessage + errorStackTrace, MessageLogEntryType.Error, Date(), bank)) messageLog.add(MessageLogEntry(message + errorStackTrace, MessageLogEntryType.Error, Date(), bank))
} }