mir/vinyldns
2
0
Fork 0
mirror of https://github.com/VinylDNS/vinyldns synced 2025-08-22 10:10:12 +00:00
Code Issues Releases Wiki Activity

Remove tab characters from log message

Browse Source
This commit is contained in:
Aravindh-Raju 2022-12-20 15:44:48 +05:30
parent 6c33a7aa89
commit 8cfc8560c7
No known key found for this signature in database
GPG Key ID: 6B4D566AC36626F6
16 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/api/src/main/scala/vinyldns/api/backend/CommandHandler.scala
View File

@ -97,7 +97,7 @@ object CommandHandler {
.handleErrorWith { error =>
val errorMessage = new StringWriter
error.printStackTrace(new PrintWriter(errorMessage))
logger.error(s"Encountered unexpected error in main flow. Error: ${errorMessage.toString.replaceAll("\n",";")}")
logger.error(s"Encountered unexpected error in main flow. Error: ${errorMessage.toString.replaceAll("\n",";").replaceAll("\t"," ")}")
// just continue, the flow should never stop unless explicitly told to do so
flow()
@ -128,7 +128,7 @@ object CommandHandler {
// or processing is disabled
val errorMessage = new StringWriter
error.printStackTrace(new PrintWriter(errorMessage))
logger.error(s"Encountered error polling message queue. Error: ${errorMessage.toString.replaceAll("\n",";")}")
logger.error(s"Encountered error polling message queue. Error: ${errorMessage.toString.replaceAll("\n",";").replaceAll("\t"," ")}")
// just keep going on the stream
pollingStream()
@ -189,7 +189,7 @@ object CommandHandler {
case Left(e) =>
val errorMessage = new StringWriter
e.printStackTrace(new PrintWriter(errorMessage))
logger.warn(s"Failed processing message need to retry; $message. Error: ${errorMessage.toString.replaceAll("\n",";")}")
logger.warn(s"Failed processing message need to retry; $message. Error: ${errorMessage.toString.replaceAll("\n",";").replaceAll("\t"," ")}")
RetryMessage(message)
case Right(ok) => ok
}

6
modules/api/src/main/scala/vinyldns/api/backend/dns/DnsBackend.scala
View File

@ -214,15 +214,15 @@ class DnsBackend(val id: String, val resolver: DNS.SimpleResolver, val xfrInfo:
} yield resp
val receivedResponse = result match {
case Right(value) => value.toString.replaceAll("\n",";")
case Right(value) => value.toString.replaceAll("\n"," ").replaceAll("\t"," ")
case Left(e) =>
val errorMessage = new StringWriter
e.printStackTrace(new PrintWriter(errorMessage))
errorMessage.toString.replaceAll("\n",";")
errorMessage.toString.replaceAll("\n",";").replaceAll("\t"," ")
}
logger.info(
s"DnsConnection.send - Sending DNS Message ${obscuredDnsMessage(msg).toString.replaceAll("\n",";")}. Received response: $receivedResponse"
s"DnsConnection.send - Sending DNS Message ${obscuredDnsMessage(msg).toString.replaceAll("\n",";").replaceAll("\t"," ")}. Received response: $receivedResponse"
)
result

2
modules/api/src/main/scala/vinyldns/api/engine/ZoneSyncHandler.scala
View File

@ -173,7 +173,7 @@ object ZoneSyncHandler extends DnsConversions with Monitored with TransactionPro
val errorMessage = new StringWriter
e.printStackTrace(new PrintWriter(errorMessage))
logger.error(
s"Encountered error syncing ; zoneName='${zoneChange.zone.name}'; zoneChange='${zoneChange.id}'. Error: ${errorMessage.toString.replaceAll("\n",";")}"
s"Encountered error syncing ; zoneName='${zoneChange.zone.name}'; zoneChange='${zoneChange.id}'. Error: ${errorMessage.toString.replaceAll("\n",";").replaceAll("\t"," ")}"
)
// We want to just move back to an active status, do not update latest sync
zoneChange.copy(

2
modules/api/src/main/scala/vinyldns/api/notifier/sns/SnsNotifier.scala
View File

@ -55,6 +55,6 @@ class SnsNotifier(config: SnsNotifierConfig, sns: AmazonSNS)
}.handleErrorWith { e =>
val errorMessage = new StringWriter
e.printStackTrace(new PrintWriter(errorMessage))
IO(logger.error(s"Failed sending batch change; batchChange='${bc.id}'. Error: ${errorMessage.toString.replaceAll("\n",";")}"))
IO(logger.error(s"Failed sending batch change; batchChange='${bc.id}'. Error: ${errorMessage.toString.replaceAll("\n",";").replaceAll("\t"," ")}"))
}.void
}

2
modules/core/src/main/scala/vinyldns/core/health/HealthCheck.scala
View File

@ -34,7 +34,7 @@ object HealthCheck {
case Left(err) =>
val errorMessage = new StringWriter
err.printStackTrace(new PrintWriter(errorMessage))
logger.error(s"HealthCheck for ${caller.getCanonicalName} failed. Error: ${errorMessage.toString.replaceAll("\n",";")}")
logger.error(s"HealthCheck for ${caller.getCanonicalName} failed. Error: ${errorMessage.toString.replaceAll("\n",";").replaceAll("\t"," ")}")
val msg = Option(err.getMessage).getOrElse("no message from error")
Left(
HealthCheckError(s"${caller.getCanonicalName} health check failed with msg='${msg}'")

2
modules/core/src/main/scala/vinyldns/core/notifier/AllNotifiers.scala
View File

@ -38,7 +38,7 @@ final case class AllNotifiers(notifiers: List[Notifier])(implicit val cs: Contex
val errorMessage = new StringWriter
e.printStackTrace(new PrintWriter(errorMessage))
IO {
logger.error(s"Notifier ${notifier.getClass.getSimpleName} failed. Error: ${errorMessage.toString.replaceAll("\n",";")}")
logger.error(s"Notifier ${notifier.getClass.getSimpleName} failed. Error: ${errorMessage.toString.replaceAll("\n",";").replaceAll("\t"," ")}")
}
}
}

2
modules/core/src/main/scala/vinyldns/core/route/Monitor.scala
View File

@ -54,7 +54,7 @@ trait Monitored {
case Left(e) =>
val errorMessage = new StringWriter
e.printStackTrace(new PrintWriter(errorMessage))
logger.error(s"Finished $id; success=false; duration=$duration seconds. Error: ${errorMessage.toString.replaceAll("\n",";")}")
logger.error(s"Finished $id; success=false; duration=$duration seconds. Error: ${errorMessage.toString.replaceAll("\n",";").replaceAll("\t"," ")}")
IO.raiseError(e)
}
}

2
modules/core/src/main/scala/vinyldns/core/task/TaskScheduler.scala
View File

@ -93,7 +93,7 @@ object TaskScheduler extends Monitored {
claimTask().bracket(runTask)(releaseTask).handleError { error =>
val errorMessage = new StringWriter
error.printStackTrace(new PrintWriter(errorMessage))
logger.error(s"""Unexpected error running task; taskName="${task.name}". Error: ${errorMessage.toString.replaceAll("\n",";")} """)
logger.error(s"""Unexpected error running task; taskName="${task.name}". Error: ${errorMessage.toString.replaceAll("\n",";").replaceAll("\t"," ")} """)
}
}

2
modules/mysql/src/main/scala/vinyldns/mysql/TransactionProvider.scala
View File

@ -54,7 +54,7 @@ trait TransactionProvider {
case e: Throwable =>
val errorMessage = new StringWriter
e.printStackTrace(new PrintWriter(errorMessage))
logger.error(s"Encountered error executing function within a database transaction ($txId). Rolling back transaction. Error: ${errorMessage.toString.replaceAll("\n",";")}")
logger.error(s"Encountered error executing function within a database transaction ($txId). Rolling back transaction. Error: ${errorMessage.toString.replaceAll("\n",";").replaceAll("\t"," ")}")
db.rollbackIfActive()
throw e
} finally {

2
modules/mysql/src/main/scala/vinyldns/mysql/queue/MySqlMessageQueue.scala
View File

@ -213,7 +213,7 @@ class MySqlMessageQueue(maxRetries: Int)
case Left((e, id)) =>
val errorMessage = new StringWriter
e.printStackTrace(new PrintWriter(errorMessage))
logger.error(s"Encountered error for message with id $id. Error: ${errorMessage.toString.replaceAll("\n",";")}")
logger.error(s"Encountered error for message with id $id. Error: ${errorMessage.toString.replaceAll("\n",";").replaceAll("\t"," ")}")
id
}

2
modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlDataStoreProvider.scala
View File

@ -103,7 +103,7 @@ class MySqlDataStoreProvider extends DataStoreProvider {
.handleError{ e =>
val errorMessage = new StringWriter
e.printStackTrace(new PrintWriter(errorMessage))
logger.error(s"Exception occurred while shutting down. Error: ${errorMessage.toString.replaceAll("\n",";")}")
logger.error(s"Exception occurred while shutting down. Error: ${errorMessage.toString.replaceAll("\n",";").replaceAll("\t"," ")}")
}
private final val HEALTH_CHECK =

2
modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlRecordSetCacheRepository.scala
View File

@ -141,7 +141,7 @@ class MySqlRecordSetCacheRepository
}.handleErrorWith { error =>
val errorMessage = new StringWriter
error.printStackTrace(new PrintWriter(errorMessage))
logger.error(s"Failed deleting records from zone $zoneName (zone id: $zone_id). Error: ${errorMessage.toString.replaceAll("\n",";")}")
logger.error(s"Failed deleting records from zone $zoneName (zone id: $zone_id). Error: ${errorMessage.toString.replaceAll("\n",";").replaceAll("\t"," ")}")
IO.raiseError(error)
}
}

2
modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlRecordSetRepository.scala
View File

@ -382,7 +382,7 @@ class MySqlRecordSetRepository extends RecordSetRepository with Monitored {
}.handleErrorWith { error =>
val errorMessage = new StringWriter
error.printStackTrace(new PrintWriter(errorMessage))
logger.error(s"Failed deleting records from zone $zoneName (zone id: $zoneId). Error: ${errorMessage.toString.replaceAll("\n",";")}")
logger.error(s"Failed deleting records from zone $zoneName (zone id: $zoneId). Error: ${errorMessage.toString.replaceAll("\n",";").replaceAll("\t"," ")}")
IO.raiseError(error)
}
}

2
modules/portal/app/controllers/LdapAuthenticator.scala
View File

@ -137,7 +137,7 @@ object LdapAuthenticator {
val errorMessage = new StringWriter
unexpectedError.printStackTrace(new PrintWriter(errorMessage))
logger.error(
s"LDAP Unexpected Error searching for user; userName='$lookupUserName'. Error: ${errorMessage.toString.replaceAll("\n",";")}"
s"LDAP Unexpected Error searching for user; userName='$lookupUserName'. Error: ${errorMessage.toString.replaceAll("\n",";").replaceAll("\t"," ")}"
)
Left(LdapServiceException(unexpectedError.getMessage))
} finally {

4
modules/portal/app/controllers/OidcAuthenticator.scala
View File

@ -189,7 +189,7 @@ class OidcAuthenticator @Inject() (wsClient: WSClient, configuration: Configurat
case Failure(e) =>
val errorMessage = new StringWriter
e.printStackTrace(new PrintWriter(errorMessage))
logger.error(s"oidc session token parse error: ${errorMessage.toString.replaceAll("\n",";")}")
logger.error(s"oidc session token parse error: ${errorMessage.toString.replaceAll("\n",";").replaceAll("\t"," ")}")
None
}
@ -265,7 +265,7 @@ class OidcAuthenticator @Inject() (wsClient: WSClient, configuration: Configurat
.leftMap { err =>
val errorMessage = new StringWriter
err.printStackTrace(new PrintWriter(errorMessage))
logger.error(s"Unexpected error in OIDC flow: ${errorMessage.toString.replaceAll("\n",";")}")
logger.error(s"Unexpected error in OIDC flow: ${errorMessage.toString.replaceAll("\n",";").replaceAll("\t"," ")}")
ErrorResponse(500, err.getMessage)
}
}

2
modules/sqs/src/main/scala/vinyldns/sqs/queue/SqsMessageQueue.scala
View File

@ -107,7 +107,7 @@ class SqsMessageQueue(val queueUrl: String, val client: AmazonSQSAsync)
case Left(e) =>
val errorMessage = new StringWriter
e.printStackTrace(new PrintWriter(errorMessage))
logger.error(s"Failed handling message with id '${message.getMessageId}'. Error: ${errorMessage.toString.replaceAll("\n",";")}")
logger.error(s"Failed handling message with id '${message.getMessageId}'. Error: ${errorMessage.toString.replaceAll("\n",";").replaceAll("\t"," ")}")
delete(message.getReceiptHandle).as(Left(e))
case Right(ok) => IO.pure(Right(ok))
}