Merge branch 'dev' into 'master' (681ebe24) · Commits · REDMIC Project / Server / Tasks

src/main/resources/application-dev.properties

+2 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,8 @@ elastic.port=9300
		elastic.clusterName=elasticsearch_dev
		redmic.elasticsearch.check.mappings=false

		logging.level.es.redmic=debug

		#Kafka config
		spring.kafka.bootstrap-servers=localhost:19092

+2 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,8 @@ elastic.port=9300
		elastic.clusterName=elasticsearch_dev
		redmic.elasticsearch.check.mappings=true

		logging.level.es.redmic=warn

		#Kafka config
		spring.kafka.bootstrap-servers=kf-1:9092,kf-2:9092,kf-3:9092

+2 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,8 @@ elastic.port=9300
		elastic.clusterName=redmic
		redmic.elasticsearch.check.mappings=true

		logging.level.es.redmic=warn

		#Kafka config
		spring.kafka.bootstrap-servers=kf-1:9092,kf-2:9092,kf-3:9092

+2 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,8 @@ elastic.port=9300
		elastic.clusterName=elasticsearch_dev
		redmic.elasticsearch.check.mappings=false

		logging.level.es.redmic=debug

		#Kafka config
		spring.kafka.bootstrap-servers=${spring.embedded.kafka.brokers}

+6 −4

Original line number	Diff line number	Diff line
		@@ -15,9 +15,9 @@ info.microservice.outputEncoding=@project.reporting.outputEncoding@

		management.endpoints.web.exposure.include=health, info, prometheus

		logging.level.root=info
		logging.level.org.springframework=info
		logging.level.es.redmic=info
		logging.level.root=warn
		logging.level.org.springframework=warn
		logging.level.es.redmic=${logging.level.es.redmic}

		#Kafka config
		spring.kafka.bootstrap-servers=${spring.kafka.bootstrap-servers}
		@@ -39,6 +39,8 @@ spring.datasource.password=password
		spring.datasource.jdbc-url=${spring.datasource.url}
		spring.datasource.initialization-mode=never

		spring.datasource.hikari.max-lifetime=600000

		# DATASOURCE Jobs
		jobs.datasource.driver-class-name=org.postgresql.Driver
		jobs.datasource.initialization-mode=never
		@@ -58,7 +60,7 @@ spring.jackson.deserialization.wrap-exceptions=false
		spring.data.jpa.repositories.enabled=true
		spring.jpa.generate-ddl=false
		spring.jpa.hibernate.ddl-auto=none
		spring.jpa.show-sql=true
		spring.jpa.show-sql=false
		spring.jpa.properties.dialect=org.hibernate.spatial.dialect.postgis.PostgisDialect
		spring.jpa.database-platform=org.hibernate.spatial.dialect.postgis.PostgisDialect
		spring.jpa.database=postgresql