diff --git a/build/docker/api/logback.xml b/build/docker/api/logback.xml index a7f4b877d..3be89973b 100644 --- a/build/docker/api/logback.xml +++ b/build/docker/api/logback.xml @@ -1,8 +1,9 @@ - - %d [test] %-5p | \(%logger{4}:%line\) | %msg %n + + vinyldns-api + vinyldns-api diff --git a/build/docker/portal/logback.xml b/build/docker/portal/logback.xml index f8a08e496..f3c208628 100644 --- a/build/docker/portal/logback.xml +++ b/build/docker/portal/logback.xml @@ -2,9 +2,10 @@ - - - %d{"yyyy-MM-dd HH:mm:ss,SSS"} %coloredLevel - %logger - %message%n%xException + + + vinyldns-portal + vinyldns-portal - - %d [test] %-5p | \(%logger{4}:%line\) | %msg %n + + vinyldns-api + vinyldns-api @@ -18,7 +19,7 @@ - + diff --git a/modules/api/src/main/resources/test/logback.xml b/modules/api/src/main/resources/test/logback.xml index a28642adc..b69706fe9 100644 --- a/modules/api/src/main/resources/test/logback.xml +++ b/modules/api/src/main/resources/test/logback.xml @@ -1,8 +1,9 @@ - - %d [test] %-5p | \(%logger{4}:%line\) | %msg %n + + vinyldns-api + vinyldns-api @@ -18,7 +19,7 @@ - + diff --git a/modules/api/src/main/scala/vinyldns/api/Boot.scala b/modules/api/src/main/scala/vinyldns/api/Boot.scala index 7f26b0cf9..4e4699ab8 100644 --- a/modules/api/src/main/scala/vinyldns/api/Boot.scala +++ b/modules/api/src/main/scala/vinyldns/api/Boot.scala @@ -219,10 +219,10 @@ object Boot extends App { () } - logger.error( + logger.info( s"STARTING VINYLDNS SERVER ON ${vinyldnsConfig.httpConfig.host}:${vinyldnsConfig.httpConfig.port}" ) - logger.error(banner) + logger.info(banner) // Starts up our http server implicit val actorSystem: ActorSystem = system @@ -237,7 +237,7 @@ object Boot extends App { // runApp gives us a Task, we actually have to run it! Running it will yield a Future, which is our app! runApp().unsafeRunAsync { case Right(_) => - logger.error("VINYLDNS SERVER STARTED SUCCESSFULLY!!") + logger.info("VINYLDNS SERVER STARTED SUCCESSFULLY!!") case Left(startupFailure) => logger.error(s"VINYLDNS SERVER UNABLE TO START $startupFailure") startupFailure.printStackTrace() diff --git a/modules/api/src/main/scala/vinyldns/api/backend/dns/DnsBackend.scala b/modules/api/src/main/scala/vinyldns/api/backend/dns/DnsBackend.scala index de888e13c..afcc77054 100644 --- a/modules/api/src/main/scala/vinyldns/api/backend/dns/DnsBackend.scala +++ b/modules/api/src/main/scala/vinyldns/api/backend/dns/DnsBackend.scala @@ -237,7 +237,7 @@ class DnsBackend(val id: String, val resolver: DNS.SimpleResolver, val xfrInfo: logger.info(s"Received TRY_AGAIN from DNS lookup; converting error: ${query.error}") fromDnsRcodeToError(DNS.Rcode.value(query.error), query.error) } else { - logger.info(s"Unparseable error code returned from DNS: ${query.error}") + logger.warn(s"Unparseable error code returned from DNS: ${query.error}") Left(TryAgain(query.error)) } diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala index 7ddf13702..84b134ca5 100644 --- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala +++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala @@ -33,7 +33,7 @@ import vinyldns.core.queue.MessageQueue class BatchChangeConverter(batchChangeRepo: BatchChangeRepository, messageQueue: MessageQueue) extends BatchChangeConverterAlgebra { - private val logger = LoggerFactory.getLogger("BatchChangeConverter") + private val logger = LoggerFactory.getLogger(classOf[BatchChangeConverter]) def sendBatchForProcessing( batchChange: BatchChange, diff --git a/modules/api/src/main/scala/vinyldns/api/notifier/email/EmailNotifier.scala b/modules/api/src/main/scala/vinyldns/api/notifier/email/EmailNotifier.scala index 35b98b482..770493e1c 100644 --- a/modules/api/src/main/scala/vinyldns/api/notifier/email/EmailNotifier.scala +++ b/modules/api/src/main/scala/vinyldns/api/notifier/email/EmailNotifier.scala @@ -46,7 +46,7 @@ import vinyldns.core.domain.batch.BatchChangeApprovalStatus._ class EmailNotifier(config: EmailNotifierConfig, session: Session, userRepository: UserRepository) extends Notifier { - private val logger = LoggerFactory.getLogger("EmailNotifier") + private val logger = LoggerFactory.getLogger(classOf[EmailNotifier]) def notify(notification: Notification[_]): IO[Unit] = notification.change match { diff --git a/modules/api/src/test/resources/logback-test.xml b/modules/api/src/test/resources/logback-test.xml index 8ab47c5a2..55c9b1b97 100644 --- a/modules/api/src/test/resources/logback-test.xml +++ b/modules/api/src/test/resources/logback-test.xml @@ -1,7 +1,8 @@ - - %msg%n + + vinyldns-api + vinyldns-api diff --git a/modules/api/src/universal/conf/logback.xml b/modules/api/src/universal/conf/logback.xml index 4146a79c5..4f55b5431 100644 --- a/modules/api/src/universal/conf/logback.xml +++ b/modules/api/src/universal/conf/logback.xml @@ -1,8 +1,9 @@ - - %d [test] %-5p | \(%logger{4}:%line\) | %msg %n + + vinyldns-api + vinyldns-api diff --git a/modules/core/src/main/scala/vinyldns/core/domain/backend/BackendLoader.scala b/modules/core/src/main/scala/vinyldns/core/domain/backend/BackendLoader.scala index aa9920dbc..4a76f8114 100644 --- a/modules/core/src/main/scala/vinyldns/core/domain/backend/BackendLoader.scala +++ b/modules/core/src/main/scala/vinyldns/core/domain/backend/BackendLoader.scala @@ -27,7 +27,7 @@ object BackendLoader { def load(configs: List[BackendProviderConfig]): IO[List[BackendProvider]] = { def loadOne(config: BackendProviderConfig): IO[BackendProvider] = for { - _ <- IO(logger.error(s"Attempting to load backend ${config.className}")) + _ <- IO(logger.info(s"Attempting to load backend ${config.className}")) provider <- IO( Class .forName(config.className) diff --git a/modules/core/src/main/scala/vinyldns/core/queue/MessageQueueLoader.scala b/modules/core/src/main/scala/vinyldns/core/queue/MessageQueueLoader.scala index 8dcfd15d6..fda675b0a 100644 --- a/modules/core/src/main/scala/vinyldns/core/queue/MessageQueueLoader.scala +++ b/modules/core/src/main/scala/vinyldns/core/queue/MessageQueueLoader.scala @@ -25,7 +25,7 @@ object MessageQueueLoader { def load(config: MessageQueueConfig): IO[MessageQueue] = for { - _ <- IO(logger.error(s"Attempting to load queue ${config.className}")) + _ <- IO(logger.info(s"Attempting to load queue ${config.className}")) provider <- IO( Class .forName(config.className) diff --git a/modules/core/src/main/scala/vinyldns/core/repository/DataStoreLoader.scala b/modules/core/src/main/scala/vinyldns/core/repository/DataStoreLoader.scala index fa267fdf6..a3f5ac12f 100644 --- a/modules/core/src/main/scala/vinyldns/core/repository/DataStoreLoader.scala +++ b/modules/core/src/main/scala/vinyldns/core/repository/DataStoreLoader.scala @@ -67,7 +67,7 @@ object DataStoreLoader { for { _ <- IO( logger - .error(s"Attempting to load repos ${config.repositories.keys} from ${config.className}") + .info(s"Attempting to load repos ${config.repositories.keys} from ${config.className}") ) provider <- IO( Class diff --git a/modules/core/src/test/resources/logback.xml b/modules/core/src/test/resources/logback.xml index 5a12e1c3c..e9d3d6772 100644 --- a/modules/core/src/test/resources/logback.xml +++ b/modules/core/src/test/resources/logback.xml @@ -1,8 +1,9 @@ - - %d [test] %-5p | \(%logger{4}:%line\) | %msg %n %nopexception + + vinyldns-core + vinyldns-core diff --git a/modules/mysql/src/main/scala/vinyldns/mysql/MySqlConnector.scala b/modules/mysql/src/main/scala/vinyldns/mysql/MySqlConnector.scala index ee4bc6e79..1fda213a2 100644 --- a/modules/mysql/src/main/scala/vinyldns/mysql/MySqlConnector.scala +++ b/modules/mysql/src/main/scala/vinyldns/mysql/MySqlConnector.scala @@ -60,13 +60,13 @@ object MySqlConnector { // Runs flyway migrations migration.load().migrate() - logger.info("migrations complete") + logger.info("Migrations complete") } } def getDataSource(settings: MySqlDataSourceSettings): IO[HikariDataSource] = IO { - logger.error(s"Initializing data source with settings: $settings") + logger.info(s"Initializing data source with settings: $settings") val dsConfig = new HikariConfig() @@ -96,7 +96,7 @@ object MySqlConnector { result match { case Success(t) => Some(t) case Failure(e) => - logger.warn("failed to startup database connection, retrying..") + logger.warn("Failed to startup database connection, retrying..") // Hard abort if we exhaust retries if (currentIndex >= times - 1) { throw e diff --git a/modules/mysql/src/main/scala/vinyldns/mysql/queue/MySqlMessageQueueProvider.scala b/modules/mysql/src/main/scala/vinyldns/mysql/queue/MySqlMessageQueueProvider.scala index 3c913cb59..5e4defec8 100644 --- a/modules/mysql/src/main/scala/vinyldns/mysql/queue/MySqlMessageQueueProvider.scala +++ b/modules/mysql/src/main/scala/vinyldns/mysql/queue/MySqlMessageQueueProvider.scala @@ -52,7 +52,7 @@ class MySqlMessageQueueProvider extends MessageQueueProvider { val queueConnectionSettings = MySqlDataSourceSettings(config, "mysqlQueuePool") getDataSource(queueConnectionSettings).map { dataSource => - logger.error("configuring connection pool for queue") + logger.info("Configuring connection pool for queue") // note this is being called 2x in the case you use the mysql datastores and // loader. That should be ok @@ -64,7 +64,7 @@ class MySqlMessageQueueProvider extends MessageQueueProvider { new DataSourceConnectionPool(dataSource, closer = new HikariCloser(dataSource)) ) - logger.error("queue connection pool init complete") + logger.info("Queue connection pool init complete") } } diff --git a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlDataStoreProvider.scala b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlDataStoreProvider.scala index b62990193..5809dfaba 100644 --- a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlDataStoreProvider.scala +++ b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlDataStoreProvider.scala @@ -83,7 +83,7 @@ class MySqlDataStoreProvider extends DataStoreProvider { val dbConnectionSettings = MySqlDataSourceSettings(config, "mysqlDbPool") getDataSource(dbConnectionSettings).map { dataSource => - logger.error("configuring connection pool") + logger.info("Configuring connection pool") // pulled out of DBs.setupAll since we're no longer using the db. structure for config DBs.loadGlobalSettings() @@ -93,13 +93,13 @@ class MySqlDataStoreProvider extends DataStoreProvider { new DataSourceConnectionPool(dataSource, closer = new HikariCloser(dataSource)) ) - logger.error("database init complete") + logger.info("Database init complete") } } private def shutdown(): IO[Unit] = IO(DBs.close()) - .handleError(e => logger.error(s"exception occurred while shutting down", e)) + .handleError(e => logger.error(s"Exception occurred while shutting down", e)) private final val HEALTH_CHECK = sql""" diff --git a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlGroupChangeRepository.scala b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlGroupChangeRepository.scala index 84c95c0ac..e7dce7064 100644 --- a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlGroupChangeRepository.scala +++ b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlGroupChangeRepository.scala @@ -64,7 +64,7 @@ class MySqlGroupChangeRepository extends GroupChangeRepository with Monitored { def save(db: DB, groupChange: GroupChange): IO[GroupChange] = monitor("repo.GroupChange.save") { IO { - logger.info( + logger.debug( s"Saving group change with (group_change_id, group_id): " + s"(${groupChange.id}, ${groupChange.newGroup.id})" ) @@ -87,7 +87,7 @@ class MySqlGroupChangeRepository extends GroupChangeRepository with Monitored { def getGroupChange(groupChangeId: String): IO[Option[GroupChange]] = monitor("repo.GroupChange.getGroupChange") { IO { - logger.info(s"Getting group change with group_change_id: $groupChangeId") + logger.debug(s"Getting group change with group_change_id: $groupChangeId") DB.readOnly { implicit s => GET_GROUP_CHANGE .bind(groupChangeId) @@ -105,7 +105,7 @@ class MySqlGroupChangeRepository extends GroupChangeRepository with Monitored { ): IO[ListGroupChangesResults] = monitor("repo.GroupChange.getGroupChanges") { IO { - logger.info( + logger.debug( s"Getting group changes with (groupId, startFrom, maxItems): ($groupId, $startFrom, $maxItems)" ) DB.readOnly { implicit s => diff --git a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlGroupRepository.scala b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlGroupRepository.scala index 146acd9d2..83ead82f7 100644 --- a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlGroupRepository.scala +++ b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlGroupRepository.scala @@ -72,7 +72,7 @@ class MySqlGroupRepository extends GroupRepository with GroupProtobufConversions def save(db: DB, group: Group): IO[Group] = monitor("repo.Group.save") { IO { - logger.info(s"Saving group with (id, name): (${group.id}, ${group.name})") + logger.debug(s"Saving group with (id, name): (${group.id}, ${group.name})") db.withinTx { implicit s => PUT_GROUP .bindByName( @@ -94,7 +94,7 @@ class MySqlGroupRepository extends GroupRepository with GroupProtobufConversions def delete(group: Group): IO[Group] = monitor("repo.Group.delete") { IO { - logger.info(s"Deleting group with (id, name): (${group.id}, ${group.name})") + logger.debug(s"Deleting group with (id, name): (${group.id}, ${group.name})") DB.localTx { implicit s => DELETE_GROUP .bind(group.id) @@ -109,7 +109,7 @@ class MySqlGroupRepository extends GroupRepository with GroupProtobufConversions def getGroup(groupId: String): IO[Option[Group]] = monitor("repo.Group.getGroup") { IO { - logger.info(s"Getting group with id: $groupId") + logger.debug(s"Getting group with id: $groupId") DB.readOnly { implicit s => GET_GROUP_BY_ID .bind(groupId) @@ -123,7 +123,7 @@ class MySqlGroupRepository extends GroupRepository with GroupProtobufConversions def getGroups(groupIds: Set[String]): IO[Set[Group]] = monitor("repo.Group.getGroups") { IO { - logger.info(s"Getting group with ids: $groupIds") + logger.debug(s"Getting group with ids: $groupIds") if (groupIds.isEmpty) Set[Group]() else { @@ -144,7 +144,7 @@ class MySqlGroupRepository extends GroupRepository with GroupProtobufConversions def getGroupByName(groupName: String): IO[Option[Group]] = monitor("repo.Group.getGroupByName") { IO { - logger.info(s"Getting group with name: $groupName") + logger.debug(s"Getting group with name: $groupName") DB.readOnly { implicit s => GET_GROUP_BY_NAME .bind(groupName) @@ -158,7 +158,7 @@ class MySqlGroupRepository extends GroupRepository with GroupProtobufConversions def getAllGroups(): IO[Set[Group]] = monitor("repo.Group.getAllGroups") { IO { - logger.info(s"Getting all groups") + logger.debug(s"Getting all groups") DB.readOnly { implicit s => GET_ALL_GROUPS .map(toGroup(1)) diff --git a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlMembershipRepository.scala b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlMembershipRepository.scala index 6c98719ad..b6174d501 100644 --- a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlMembershipRepository.scala +++ b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlMembershipRepository.scala @@ -83,7 +83,7 @@ class MySqlMembershipRepository extends MembershipRepository with Monitored { // Diff is used to check if the users we are trying to add in the group is already present. // If they don't exist in the group, we save the users. val saveMembers = nonEmpty.diff(existingMembers) - logger.info(s"Saving into group $groupId members $nonEmpty") + logger.debug(s"Saving into group $groupId members $nonEmpty") db.withinTx { implicit s => SAVE_MEMBERS.batchByName(saveParams(saveMembers, groupId, isAdmin): _*).apply() @@ -100,7 +100,7 @@ class MySqlMembershipRepository extends MembershipRepository with Monitored { case nonEmpty => monitor("repo.Membership.removeMembers") { IO { - logger.info(s"Removing from group $groupId members $nonEmpty") + logger.debug(s"Removing from group $groupId members $nonEmpty") db.withinTx { implicit s => val inClause = " AND user_id IN (" + nonEmpty.as("?").mkString(",") + ")" val query = BASE_REMOVE_MEMBERS + inClause @@ -118,7 +118,7 @@ class MySqlMembershipRepository extends MembershipRepository with Monitored { def getExistingMembers(groupId: String): Set[String] = monitor("repo.Membership.getExistingUsers") { IO { - logger.info(s"Getting existing users") + logger.debug(s"Getting existing users") DB.readOnly { implicit s => SQL(GET_EXISTING_USERS) .bind(groupId) @@ -133,7 +133,7 @@ class MySqlMembershipRepository extends MembershipRepository with Monitored { def getGroupsForUser(userId: String): IO[Set[String]] = monitor("repo.Membership.getGroupsForUser") { IO { - logger.info(s"Getting groups for user $userId") + logger.debug(s"Getting groups for user $userId") DB.readOnly { implicit s => GET_GROUPS_FOR_USER .bind(userId) @@ -147,7 +147,7 @@ class MySqlMembershipRepository extends MembershipRepository with Monitored { def getUsersForGroup(groupId: String, isAdmin: Option[Boolean]): IO[Set[String]] = IO { - logger.info(s"Getting users for group $groupId") + logger.debug(s"Getting users for group $groupId") DB.readOnly { implicit s => val baseConditions = Seq('groupId -> groupId) diff --git a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlRecordSetRepository.scala b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlRecordSetRepository.scala index 61bea6d2f..4984f6f4a 100644 --- a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlRecordSetRepository.scala +++ b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlRecordSetRepository.scala @@ -383,7 +383,7 @@ class MySqlRecordSetRepository extends RecordSetRepository with Monitored { .update() .apply() } - logger.info(s"Deleted $numDeleted records from zone $zoneName (zone id: $zoneId)") + logger.debug(s"Deleted $numDeleted records from zone $zoneName (zone id: $zoneId)") }.handleErrorWith { error => logger.error(s"Failed deleting records from zone $zoneName (zone id: $zoneId)", error) IO.raiseError(error) diff --git a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlUserChangeRepository.scala b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlUserChangeRepository.scala index 3aff1195b..03513a552 100644 --- a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlUserChangeRepository.scala +++ b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlUserChangeRepository.scala @@ -48,7 +48,7 @@ class MySqlUserChangeRepository def get(changeId: String): IO[Option[UserChange]] = monitor("repo.UserChange.get") { - logger.info(s"Getting user change with id: $changeId") + logger.debug(s"Getting user change with id: $changeId") IO { DB.readOnly { implicit s => GET_USER_CHANGE_BY_ID @@ -62,7 +62,7 @@ class MySqlUserChangeRepository def save(change: UserChange): IO[UserChange] = monitor("repo.UserChange.save") { - logger.info(s"Saving user change: $change") + logger.debug(s"Saving user change: $change") IO { DB.localTx { implicit s => PUT_USER_CHANGE diff --git a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlUserRepository.scala b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlUserRepository.scala index 937c433b7..a4e2e6a37 100644 --- a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlUserRepository.scala +++ b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlUserRepository.scala @@ -68,7 +68,7 @@ class MySqlUserRepository(cryptoAlgebra: CryptoAlgebra) def getUser(userId: String): IO[Option[User]] = monitor("repo.User.getUser") { - logger.info(s"Getting user with id: $userId") + logger.debug(s"Getting user with id: $userId") IO { DB.readOnly { implicit s => GET_USER_BY_ID @@ -86,7 +86,7 @@ class MySqlUserRepository(cryptoAlgebra: CryptoAlgebra) maxItems: Option[Int] ): IO[ListUsersResults] = monitor("repo.User.getUsers") { - logger.info(s"Getting users with ids: $userIds") + logger.debug(s"Getting users with ids: $userIds") IO { if (userIds.isEmpty) ListUsersResults(List[User](), None) @@ -133,7 +133,7 @@ class MySqlUserRepository(cryptoAlgebra: CryptoAlgebra) def getUserByAccessKey(accessKey: String): IO[Option[User]] = monitor("repo.User.getUserByAccessKey") { IO { - logger.info(s"Getting user with accessKey: $accessKey") + logger.debug(s"Getting user with accessKey: $accessKey") DB.readOnly { implicit s => GET_USER_BY_ACCESS_KEY .bind(accessKey) @@ -147,7 +147,7 @@ class MySqlUserRepository(cryptoAlgebra: CryptoAlgebra) def getUserByName(userName: String): IO[Option[User]] = monitor("repo.User.getUserByName") { IO { - logger.info(s"Getting user with userName: $userName") + logger.debug(s"Getting user with userName: $userName") DB.readOnly { implicit s => GET_USER_BY_USER_NAME .bind(userName) @@ -161,7 +161,7 @@ class MySqlUserRepository(cryptoAlgebra: CryptoAlgebra) def save(user: User): IO[User] = monitor("repo.User.save") { IO { - logger.info(s"Saving user with id: ${user.id}") + logger.debug(s"Saving user with id: ${user.id}") DB.localTx { implicit s => PUT_USER .bindByName( @@ -180,7 +180,7 @@ class MySqlUserRepository(cryptoAlgebra: CryptoAlgebra) def save(users: List[User]): IO[List[User]] = monitor("repo.User.save") { IO { - logger.info(s"Saving users with ids: ${users.map(_.id).mkString(", ")}") + logger.debug(s"Saving users with ids: ${users.map(_.id).mkString(", ")}") val updates = users.map { u => Seq( diff --git a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlZoneChangeRepository.scala b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlZoneChangeRepository.scala index f0676683f..6a48da8d3 100644 --- a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlZoneChangeRepository.scala +++ b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlZoneChangeRepository.scala @@ -49,7 +49,7 @@ class MySqlZoneChangeRepository override def save(zoneChange: ZoneChange): IO[ZoneChange] = monitor("repo.ZoneChange.save") { IO { - logger.info(s"Saving zone change ${zoneChange.id}") + logger.debug(s"Saving zone change ${zoneChange.id}") DB.localTx { implicit s => PUT_ZONE_CHANGE .bindByName( @@ -74,7 +74,7 @@ class MySqlZoneChangeRepository // sorted from most recent, startFrom is an offset from the most recent change monitor("repo.ZoneChange.listZoneChanges") { IO { - logger.info(s"Getting zone changes for zone $zoneId") + logger.debug(s"Getting zone changes for zone $zoneId") DB.readOnly { implicit s => val startValue = startFrom.getOrElse(DateTime.now().getMillis.toString) // maxItems gets a plus one to know if the table is exhausted so we can conditionally give a nextId diff --git a/modules/portal/conf/logback-test.xml b/modules/portal/conf/logback-test.xml index 21dfac5eb..ea9e5b4f7 100644 --- a/modules/portal/conf/logback-test.xml +++ b/modules/portal/conf/logback-test.xml @@ -2,9 +2,10 @@ - - - %d{"yyyy-MM-dd HH:mm:ss,SSS"} %coloredLevel - %logger - %message%n%xException + + + vinyldns-portal + vinyldns-portal