Commit eab425a7 authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' into 'master' 

Añade propiedades para reducir tamaño de los logs

See merge request redmic-project/server/api!15
parents 65356e7d 5bbe989b

src/main/resources/application-dev.properties

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ elastic.port=9300 
elastic.clusterName=elasticsearch_dev

redmic.elasticsearch.check.mappings=true



logging.level.es.redmic=debug



#Mediastorage S3

aws.bucket=mediastorage.redmicdev

aws.region=eu-west-1

src/main/resources/application-pre.properties

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ elastic.port=9300 
elastic.clusterName=elasticsearch_dev

redmic.elasticsearch.check.mappings=true



logging.level.es.redmic=warn



#Mediastorage S3

aws.bucket=mediastorage.redmicdev

aws.region=eu-west-1

src/main/resources/application-prod.properties

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ elastic.port=9300 
elastic.clusterName=redmic

redmic.elasticsearch.check.mappings=true



logging.level.es.redmic=warn



#Mediastorage S3

aws.bucket=mediastorage.redmic

aws.region=eu-west-1

src/main/resources/application-test.properties

+1 −2
Original line number Diff line number Diff line
@@ -15,8 +15,7 @@ spring.datasource.url=jdbc:postgresql://redmic.net:5432/redmic?stringtype=unspec 


#logging.level.ma.glasnost.orika=DEBUG



logging.level.org.hibernate.SQL=DEBUG

logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE

logging.level.es.redmic=debug



#oauth

oauth.server=http://redmic.net:8081

src/main/resources/application.properties

+7 −1
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ info.microservice.outputEncoding=@project.reporting.outputEncoding@ 


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



logging.level.root=warn

logging.level.org.springframework=warn

logging.level.es.redmic=${logging.level.es.redmic}



#Mediastorage S3

aws.bucket=${aws.bucket}

aws.access.key=aws.access.key
@@ -45,6 +49,8 @@ spring.datasource.username=username 
spring.datasource.password=password

spring.datasource.url=${spring.datasource.url}



spring.datasource.hikari.max-lifetime=600000



#oauth

oauth.userid.endpoint=${oauth.server}/api/oauth/userid

oauth.check_token.endpoint=${oauth.server}/api/oauth/check_token
@@ -54,7 +60,7 @@ oauth.client.secret=secret 
# JPA (JpaBaseConfiguration, HibernateJpaAutoConfiguration)

spring.data.jpa.repositories.enabled=true

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.properties.default_schema=sde

spring.jpa.properties.hibernate.default_schema=sde