diff --git a/pom.xml b/pom.xml index ad665e6ff21fe253fac125dbf21dce25e09a13cc..44548256a313aa3bc3eed73cd5b783eff7c1d764 100644 --- a/pom.xml +++ b/pom.xml @@ -129,11 +129,6 @@ 2.9.5 - - org.codehaus.groovy - groovy-all - - io.micrometer micrometer-core diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 83c05a166aa6e841497750795f8130382a7700de..333924bc292b78b3965b8bea3cb71e41dd9cc5cc 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -12,6 +12,20 @@ spring: keyspace-name: account contact-points: localhost port: 9042 +# To enable colors in Eclipse: +# spring.output.ansi.enabled=ALWAYS and in eclipse +# Help -> Install New Software... and click "Add..." to add the following URL: +# http://www.mihai-nita.net/eclipse + output: + ansi: + enabled: ALWAYS + +logging: + level: + root: INFO + org: + springframework: + web: INFO complete: pending: @@ -28,7 +42,7 @@ management: endpoints: web: exposure: - include: 'prometheus, health, info' + include: 'prometheus, health, info, loggers' metrics: export: prometheus: diff --git a/src/main/resources/application-production.yml b/src/main/resources/application-production.yml index 4d7051cad6dc00478043b482af086b27d54f826b..b13753a35877424e9df59acd29e604266efe8885 100644 --- a/src/main/resources/application-production.yml +++ b/src/main/resources/application-production.yml @@ -13,6 +13,13 @@ spring: contact-points: ${CASSANDRA_CONTACT_POINTS:cassandra.cassandra.svc.cluster.local} port: ${CASSANDRA_PORT:9042} +logging: + level: + root: INFO + org: + springframework: + web: INFO + complete: pending: account: @@ -28,7 +35,7 @@ management: endpoints: web: exposure: - include: 'prometheus, health, info' + include: 'prometheus, health, info, loggers' metrics: export: prometheus: diff --git a/src/main/resources/logback-spring.groovy b/src/main/resources/logback-spring.groovy deleted file mode 100644 index 417c6c7f7fb5621ccd58d76f3f1193ee771e7e41..0000000000000000000000000000000000000000 --- a/src/main/resources/logback-spring.groovy +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright (C) 2018 Nynja Inc. All rights reserved. - */ - -import ch.qos.logback.classic.encoder.PatternLayoutEncoder -import ch.qos.logback.core.ConsoleAppender -import ch.qos.logback.core.rolling.RollingFileAppender -import ch.qos.logback.core.rolling.TimeBasedRollingPolicy -import ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP -import ch.qos.logback.core.status.OnConsoleStatusListener -import ch.qos.logback.classic.Level - -statusListener(OnConsoleStatusListener) - -def file = "${System.getProperty('log.dir', '')}account-service-%d.%i.log" - -appender("FILE", RollingFileAppender) { - // add a status message regarding the file property - addInfo("Starting logging to $file") - append = true - encoder(PatternLayoutEncoder) { pattern = "%d{HH:mm:ss.SSS} %level %logger - %msg%n" } - rollingPolicy(TimeBasedRollingPolicy) { - fileNamePattern = "$file" - timeBasedFileNamingAndTriggeringPolicy(SizeAndTimeBasedFNATP) { maxFileSize = "10mb" }} -} - -appender("Console-Appender", ConsoleAppender) { - encoder(PatternLayoutEncoder) { pattern = "%d{HH:mm:ss.SSS} %level %logger - %msg%n" } -} - -logger("org.springframework.cloud.config.client.ConfigServicePropertySourceLocator", Level.WARN) -root(INFO, ["Console-Appender"]) -root(Level.toLevel("${System.getProperty('log.level', 'INFO')}"), ["FILE"]) \ No newline at end of file