Commit 7c211346 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Elimina mensaje de log para evitar desbordamiento

See merge request redmic-project/server/ais!3
parents e50aa94f 49e15067

.gitlab-ci.yml

+3 −1
Original line number Diff line number Diff line
@@ -162,7 +162,9 @@ deploy-pro: 
  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}

    STATUS_CHECK_DELAY: 120

    STACK: vessel

    SERVICES_TO_CHECK: vessel_${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

src/main/java/es/redmic/ais/service/AISService.java

+4 −3
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ public class AISService { 


	protected static Logger logger = LogManager.getLogger();



	@Value("${broker.topic.realtime.tracking.vessels.key.prefix}")

	private String prefix;



	@Value("${aishub.service.url}")

	private String urlAIS;
@@ -128,10 +131,8 @@ public class AISService { 


	private void publishToKafka(AISTrackingDTO dto) {



		logger.info("Tracking vessel: " + dto.getMmsi());



		ListenableFuture<SendResult<String, AISTrackingDTO>> future = kafkaTemplate.send(TOPIC,

				dto.getMmsi().toString(), dto);

				prefix + dto.getMmsi().toString(), dto);



		future.addCallback(new SendListener());

	}

src/main/resources/application.properties

+3 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ info.vessels-view.outputEncoding=@project.reporting.outputEncoding@ 


logging.level.root=warn

logging.level.org.springframework=warn

logging.level.es.redmic=warn

logging.level.es.redmic=info

logging.level.es.redmic.brokerlib=error



spring.mvc.locale-resolver=fixed
@@ -41,6 +41,8 @@ spring.kafka.properties.schema.registry.url=${spring.kafka.properties.schema.reg 
#topic del broker para enviar nuevos tracking de barcos

broker.topic.realtime.tracking.vessels=realtime.tracking.vessels



broker.topic.realtime.tracking.vessels.key.prefix=vessel-mmsi-



config.fixedDelay=${config.fixedDelay}

app.scheduling.enable=${app.scheduling.enable}