From d64bb9fec00484af0c31d38212f0c831e0c91856 Mon Sep 17 00:00:00 2001 From: dmccoystephenson Date: Wed, 9 Apr 2025 14:32:48 -0600 Subject: [PATCH 1/8] Added warn log statement for when 'itis' or 'text' not found in item when converting TMC TIM --- .../library/helpers/JsonToJavaConverter.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/cv-data-service-library/src/main/java/com/trihydro/library/helpers/JsonToJavaConverter.java b/cv-data-service-library/src/main/java/com/trihydro/library/helpers/JsonToJavaConverter.java index 5dad11f4..86e4deb0 100644 --- a/cv-data-service-library/src/main/java/com/trihydro/library/helpers/JsonToJavaConverter.java +++ b/cv-data-service-library/src/main/java/com/trihydro/library/helpers/JsonToJavaConverter.java @@ -11,6 +11,7 @@ import java.util.List; import java.util.Map; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import com.fasterxml.jackson.core.JsonProcessingException; @@ -40,6 +41,7 @@ import us.dot.its.jpo.ode.util.JsonUtils; @Component +@Slf4j public class JsonToJavaConverter { private ObjectMapper mapper = new ObjectMapper(); @@ -523,12 +525,16 @@ public OdeTimPayload convertTmcTimTopicJsonToJava(String value) { String item = null; if (sequenceArrNode != null && sequenceArrNode.isArray()) { for (final JsonNode objNode : sequenceArrNode) { - if (objNode.get("item").get("itis") != null) + if (objNode.get("item").get("itis") != null) { item = mapper.treeToValue(objNode.get("item").get("itis"), String.class); - else if (objNode.get("item").get("text") != null) + } else if (objNode.get("item").get("text") != null) { item = mapper.treeToValue(objNode.get("item").get("text"), String.class); - if (!itemsList.contains(item)) + } else { + log.warn("'itis' or 'text' not found in item when converting TMC TIM"); + } + if (!itemsList.contains(item)) { itemsList.add(item); + } } } From 6f3fba589649fb9d087495eba20f415c4497bf8a Mon Sep 17 00:00:00 2001 From: dmccoystephenson Date: Wed, 9 Apr 2025 14:34:03 -0600 Subject: [PATCH 2/8] Added another warn log statement for when 'itis' or 'text' not found in item when converting TMC TIM --- .../com/trihydro/library/helpers/JsonToJavaConverter.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cv-data-service-library/src/main/java/com/trihydro/library/helpers/JsonToJavaConverter.java b/cv-data-service-library/src/main/java/com/trihydro/library/helpers/JsonToJavaConverter.java index 86e4deb0..51d532fc 100644 --- a/cv-data-service-library/src/main/java/com/trihydro/library/helpers/JsonToJavaConverter.java +++ b/cv-data-service-library/src/main/java/com/trihydro/library/helpers/JsonToJavaConverter.java @@ -540,10 +540,13 @@ public OdeTimPayload convertTmcTimTopicJsonToJava(String value) { // ADD NON ARRAY ELEMENT if (sequenceArrNode != null && !sequenceArrNode.isArray()) { - if (sequenceArrNode.get("item").get("itis") != null) + if (sequenceArrNode.get("item").get("itis") != null) { item = mapper.treeToValue(sequenceArrNode.get("item").get("itis"), String.class); - else if (sequenceArrNode.get("item").get("text") != null) + } else if (sequenceArrNode.get("item").get("text") != null) { item = mapper.treeToValue(sequenceArrNode.get("item").get("text"), String.class); + } else { + log.warn("'itis' or 'text' not found in item when converting TMC TIM"); + } itemsList.add(item); } From e0c5c7458622c572d94498a0e176c877ee5444cb Mon Sep 17 00:00:00 2001 From: dmccoystephenson Date: Wed, 9 Apr 2025 14:36:13 -0600 Subject: [PATCH 3/8] Set default frameType to 'advisory' when missing in JSON. Added a fallback mechanism in JsonToJavaConverter to handle cases where frameType is not present in the TravelerDataFrame during the conversion process. A warning is logged, and the frameType defaults to 'advisory' to ensure proper handling and avoid potential null values. --- .../java/com/trihydro/library/helpers/JsonToJavaConverter.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cv-data-service-library/src/main/java/com/trihydro/library/helpers/JsonToJavaConverter.java b/cv-data-service-library/src/main/java/com/trihydro/library/helpers/JsonToJavaConverter.java index 51d532fc..7fa6818d 100644 --- a/cv-data-service-library/src/main/java/com/trihydro/library/helpers/JsonToJavaConverter.java +++ b/cv-data-service-library/src/main/java/com/trihydro/library/helpers/JsonToJavaConverter.java @@ -556,6 +556,9 @@ public OdeTimPayload convertTmcTimTopicJsonToJava(String value) { if (frameTypeNode != null && frameTypeNode.fieldNames().hasNext()) { TravelerInfoType frameType = TravelerInfoType.valueOf(frameTypeNode.fieldNames().next()); dataFrame.setFrameType(frameType); + } else { + log.warn("frameType not found in TravelerDataFrame when converting TMC TIM. Defaulting to 'advisory'"); + dataFrame.setFrameType(TravelerInfoType.advisory); } JsonNode startTimeNode = travelerDataFrame.get("startTime"); From 4921818c4a5a4c370a8ffd95c5e1432d146df281 Mon Sep 17 00:00:00 2001 From: dmccoystephenson Date: Wed, 9 Apr 2025 14:39:59 -0600 Subject: [PATCH 4/8] Replaced usages of `System.out` with slf4j logging in JsonToJavaConverter class --- .../library/helpers/JsonToJavaConverter.java | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/cv-data-service-library/src/main/java/com/trihydro/library/helpers/JsonToJavaConverter.java b/cv-data-service-library/src/main/java/com/trihydro/library/helpers/JsonToJavaConverter.java index 7fa6818d..3069e394 100644 --- a/cv-data-service-library/src/main/java/com/trihydro/library/helpers/JsonToJavaConverter.java +++ b/cv-data-service-library/src/main/java/com/trihydro/library/helpers/JsonToJavaConverter.java @@ -97,13 +97,12 @@ public OdeLogMetadata convertTimMetadataJsonToJava(String value) { ((ObjectNode) metaDataNode).replace("receivedMessageDetails", receivedMessageDetailsNode); } } - // System.out.println(metaDataNode); + log.trace("MetaDataNode: {}", metaDataNode); odeTimMetadata = mapper.treeToValue(metaDataNode, OdeLogMetadata.class); } catch (IOException e) { - System.out.println("IOException"); - System.out.println(e.getStackTrace()); + log.error("An IOException occurred while converting TIM metadata JSON to Java", e); } catch (NullPointerException e) { - System.out.println(e.getMessage()); + log.error("A NullPointerException occurred while converting TIM metadata JSON to Java: {}", e.getMessage()); } return odeTimMetadata; @@ -168,10 +167,10 @@ public OdeRequestMsgMetadata convertBroadcastTimMetadataJsonToJava(String value) } } catch (IOException e) { - System.out.println("IOException"); - System.out.println(e.getStackTrace()); + log.error("An IOException occurred while converting Broadcast TIM metadata JSON to Java", e); } catch (NullPointerException e) { - System.out.println(e.getMessage()); + log.error("A NullPointerException occurred while converting Broadcast TIM metadata JSON to Java: {}", + e.getMessage()); } return odeTimMetadata; } @@ -361,7 +360,7 @@ else if (sequenceArrNode.get("item").get("text") != null) regions.add(region); } } else { - System.out.println("warning: geographicalPathNode is not an object or an array"); + log.warn("geographicalPathNode is not an object or an array"); } dataFrame.setRegions(regions.toArray(new OdeTravelerInformationMessage.DataFrame.Region[regions.size()])); @@ -371,9 +370,9 @@ else if (sequenceArrNode.get("item").get("text") != null) odeTimPayload = new OdeTimPayload(); odeTimPayload.setData(tim); } catch (IOException e) { - System.out.println(e.getStackTrace()); + log.error("An IOException occurred while converting TIM JSON to Java", e); } catch (NullPointerException e) { - System.out.println(e.getMessage()); + log.error("A NullPointerException occurred while converting TIM JSON to Java: {}", e.getMessage()); } return odeTimPayload; @@ -588,7 +587,7 @@ public OdeTimPayload convertTmcTimTopicJsonToJava(String value) { regions.add(region); } } else { - System.out.println("warning: geographicalPathNode is not an object or an array"); + log.warn("geographicalPathNode is not an object or an array"); } dataFrame.setRegions(regions.toArray(OdeTravelerInformationMessage.DataFrame.Region[]::new)); @@ -599,9 +598,9 @@ public OdeTimPayload convertTmcTimTopicJsonToJava(String value) { odeTimPayload = new OdeTimPayload(); odeTimPayload.setData(tim); } catch (IOException e) { - System.out.println(e.getStackTrace()); + log.error("An IOException occurred while converting TMC TIM JSON to Java", e); } catch (NullPointerException e) { - System.out.println(e.getMessage()); + log.error("A NullPointerException occurred while converting TMC TIM JSON to Java: {}", e.getMessage()); } return odeTimPayload; @@ -615,9 +614,9 @@ public OdeTravelerInformationMessage convertBroadcastTimPayloadJsonToJava(String JsonNode timNode = JsonUtils.getJsonNode(value, "payload").get("data"); odeTim = mapper.treeToValue(timNode, OdeTravelerInformationMessage.class); } catch (IOException e) { - System.out.println(e.getStackTrace()); + log.error("An IOException occurred while converting Broadcast TIM JSON to Java", e); } catch (NullPointerException e) { - System.out.println(e.getMessage()); + log.error("A NullPointerException occurred while converting Broadcast TIM JSON to Java: {}", e.getMessage()); } return odeTim; From 8c912f4cb43df7776920c1c222224a455655b29f Mon Sep 17 00:00:00 2001 From: dmccoystephenson Date: Wed, 9 Apr 2025 14:41:32 -0600 Subject: [PATCH 5/8] Refactor: remove unused conversion methods and imports Removed `convertJ2735SpecialVehicleExtensionsJsonToJava` and `convertJ2735SupplementalVehicleExtensionsJsonToJava` methods, as well as their associated imports. --- .../library/helpers/JsonToJavaConverter.java | 33 ------------------- 1 file changed, 33 deletions(-) diff --git a/cv-data-service-library/src/main/java/com/trihydro/library/helpers/JsonToJavaConverter.java b/cv-data-service-library/src/main/java/com/trihydro/library/helpers/JsonToJavaConverter.java index 3069e394..f68e2e8f 100644 --- a/cv-data-service-library/src/main/java/com/trihydro/library/helpers/JsonToJavaConverter.java +++ b/cv-data-service-library/src/main/java/com/trihydro/library/helpers/JsonToJavaConverter.java @@ -30,8 +30,6 @@ import us.dot.its.jpo.ode.plugin.SNMP; import us.dot.its.jpo.ode.plugin.ServiceRequest; import us.dot.its.jpo.ode.plugin.SnmpProtocol; -import us.dot.its.jpo.ode.plugin.j2735.J2735SpecialVehicleExtensions; -import us.dot.its.jpo.ode.plugin.j2735.J2735SupplementalVehicleExtensions; import us.dot.its.jpo.ode.plugin.j2735.OdePosition3D; import us.dot.its.jpo.ode.plugin.j2735.OdeTravelerInformationMessage; import us.dot.its.jpo.ode.plugin.j2735.OdeTravelerInformationMessage.DataFrame.Region; @@ -50,37 +48,6 @@ public JsonToJavaConverter() { mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); } - public J2735SpecialVehicleExtensions convertJ2735SpecialVehicleExtensionsJsonToJava(String value, int i) { - - JsonNode part2Node = getPart2Node(value, i); - J2735SpecialVehicleExtensions spve = null; - try { - spve = mapper.treeToValue(part2Node, J2735SpecialVehicleExtensions.class); - } catch (JsonProcessingException e) { - e.printStackTrace(); - } - return spve; - } - - public J2735SupplementalVehicleExtensions convertJ2735SupplementalVehicleExtensionsJsonToJava(String value, int i) { - - JsonNode part2Node = getPart2Node(value, i); - J2735SupplementalVehicleExtensions suve = null; - try { - suve = mapper.treeToValue(part2Node, J2735SupplementalVehicleExtensions.class); - } catch (JsonProcessingException e) { - e.printStackTrace(); - } - return suve; - } - - public JsonNode getPart2Node(String value, int i) { - JsonNode part2 = JsonUtils.getJsonNode(value, "payload").get("data").get("partII"); - if (part2 != null) - return part2.get(i).get("value"); - return null; - } - public OdeLogMetadata convertTimMetadataJsonToJava(String value) { OdeLogMetadata odeTimMetadata = null; From bdb640825ffce5545a6707a02b261af8ef14937e Mon Sep 17 00:00:00 2001 From: dmccoystephenson Date: Wed, 9 Apr 2025 14:41:50 -0600 Subject: [PATCH 6/8] Make ObjectMapper instance final in JsonToJavaConverter Marking the ObjectMapper as final ensures its immutability and prevents accidental reassignment. This change improves code stability and readability, aligning with best practices. --- .../java/com/trihydro/library/helpers/JsonToJavaConverter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cv-data-service-library/src/main/java/com/trihydro/library/helpers/JsonToJavaConverter.java b/cv-data-service-library/src/main/java/com/trihydro/library/helpers/JsonToJavaConverter.java index f68e2e8f..1709b375 100644 --- a/cv-data-service-library/src/main/java/com/trihydro/library/helpers/JsonToJavaConverter.java +++ b/cv-data-service-library/src/main/java/com/trihydro/library/helpers/JsonToJavaConverter.java @@ -42,7 +42,7 @@ @Slf4j public class JsonToJavaConverter { - private ObjectMapper mapper = new ObjectMapper(); + private final ObjectMapper mapper = new ObjectMapper(); public JsonToJavaConverter() { mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); From a9aa1eccc35ea5b248beb01809037d225047a620 Mon Sep 17 00:00:00 2001 From: dmccoystephenson Date: Wed, 9 Apr 2025 14:54:53 -0600 Subject: [PATCH 7/8] Refactor TIM test data handling with external JSON file Moved mock OdeTravelerInformationMessage JSON content to an external file for better readability and maintainability. Updated test methods and helper functions to read the JSON data from the new file, ensuring consistency and reducing code duplication. Adjusted method signatures to handle IOException as needed. --- .../library/service/WydotTimServiceTest.java | 28 ++++---- .../mockOdeTravelerInformationMessage.json | 71 +++++++++++++++++++ 2 files changed, 87 insertions(+), 12 deletions(-) create mode 100644 cv-data-service-library/src/test/resources/com/trihydro/library/service/mockOdeTravelerInformationMessage.json diff --git a/cv-data-service-library/src/test/java/com/trihydro/library/service/WydotTimServiceTest.java b/cv-data-service-library/src/test/java/com/trihydro/library/service/WydotTimServiceTest.java index 9d8e9e11..e14436a2 100644 --- a/cv-data-service-library/src/test/java/com/trihydro/library/service/WydotTimServiceTest.java +++ b/cv-data-service-library/src/test/java/com/trihydro/library/service/WydotTimServiceTest.java @@ -15,7 +15,11 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import java.io.IOException; import java.math.BigDecimal; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Paths; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -142,14 +146,14 @@ private List getActiveTims(boolean isSat) { return activeTims; } - private OdeTravelerInformationMessage getMockOdeTravelerInformationMessage() { - String timJson = "{\"msgCnt\":\"1\",\"timeStamp\":\"2017-08-03T22:25:36.297Z\",\"urlB\":\"null\",\"packetID\":\"EC9C236B0000000000\",\"dataframes\":[{\"startDateTime\":\"2017-08-02T22:25:00.000Z\",\"durationTime\":1,\"doNotUse1\":\"0\",\"frameType\":\"advisory\",\"msgId\":{\"roadSignID\":{\"position\":{\"latitude\":\"41.678473\",\"longitude\":\"-108.782775\",\"elevation\":\"917.1432\"},\"viewAngle\":\"1010101010101010\",\"mutcdCode\":\"warning\",\"crc\":\"0000\"}},\"priority\":\"0\",\"doNotUse2\":\"3\",\"regions\":[{\"name\":\"Testing TIM\",\"regulatorID\":\"0\",\"segmentID\":\"33\",\"anchorPosition\":{\"latitude\":\"41.2500807\",\"longitude\":\"-111.0093847\",\"elevation\":\"2020.6969900289998\"},\"laneWidth\":\"7\",\"directionality\":\"3\",\"closedPath\":\"false\",\"description\":\"path\",\"path\":{\"scale\":\"0\",\"type\":\"ll\",\"nodes\":[{\"nodeLong\":\"0.0030982\",\"nodeLat\":\"0.0014562\",\"delta\":\"node-LL3\"},{\"nodeLong\":\"-111.0093847\",\"nodeLat\":\"41.2500807\",\"delta\":\"node-LatLon\"}]},\"direction\":\"0000000000001010\"}],\"doNotUse4\":\"2\",\"doNotUse3\":\"3\",\"content\":\"Advisory\",\"items\":[\"125\",\"some text\",\"250\",\"'98765\"],\"url\":\"null\"}]}"; + private OdeTravelerInformationMessage getMockOdeTravelerInformationMessage() throws IOException { + String timJson = + new String(Files.readAllBytes(Paths.get("src/test/resources/com/trihydro/library/service/mockOdeTravelerInformationMessage.json"))); Gson gson = new Gson(); - OdeTravelerInformationMessage mockOdeTravelerInformationMessage = gson.fromJson(timJson, OdeTravelerInformationMessage.class); - return mockOdeTravelerInformationMessage; + return gson.fromJson(timJson, OdeTravelerInformationMessage.class); } - private WydotOdeTravelerInformationMessage getMockWydotOdeTravelerInformationMessage() { + private WydotOdeTravelerInformationMessage getMockWydotOdeTravelerInformationMessage() throws IOException { OdeTravelerInformationMessage mockOdeTravelerInformationMessage = getMockOdeTravelerInformationMessage(); WydotOdeTravelerInformationMessage mockWydotOdeTravelerInformationMessage = new WydotOdeTravelerInformationMessage(); mockWydotOdeTravelerInformationMessage.setMsgCnt(mockOdeTravelerInformationMessage.getMsgCnt()); @@ -191,7 +195,7 @@ private WydotTim getMockWydotTim() { return wydotTim; } - private WydotTravelerInputData getMockWydotTravelerInputDataWithServiceRequest() { + private WydotTravelerInputData getMockWydotTravelerInputDataWithServiceRequest() throws IOException { WydotTravelerInputData wydotTravelerInputData = new WydotTravelerInputData(); wydotTravelerInputData.setTim(getMockOdeTravelerInformationMessage()); ServiceRequest serviceRequest = new ServiceRequest(); @@ -379,7 +383,7 @@ public void getAllMilepostsForTim_EndPointNull() { } @Test - public void sendTimToSDW_MultipleActiveSatTimsFound() { + public void sendTimToSDW_MultipleActiveSatTimsFound() throws IOException { // Arrange List activeSatTims = getActiveTims(true); when(mockActiveTimService.getActiveTimsByClientIdDirection(any(), any(), any())).thenReturn(activeSatTims); @@ -403,7 +407,7 @@ public void sendTimToSDW_MultipleActiveSatTimsFound() { } @Test - public void sendTimToSDW_NoActiveSatTimsFound() { + public void sendTimToSDW_NoActiveSatTimsFound() throws IOException { // Arrange when(mockActiveTimService.getActiveTimsByClientIdDirection(any(), any(), any())).thenReturn(new ArrayList<>()); WydotTim wydotTim = getMockWydotTim(); @@ -424,7 +428,7 @@ public void sendTimToSDW_NoActiveSatTimsFound() { } @Test - public void sendTimToSDW_SingleActiveSatTimFound() { + public void sendTimToSDW_SingleActiveSatTimFound() throws IOException { // Arrange List activeSatTims = getActiveTims(true).subList(0, 1); when(mockActiveTimService.getActiveTimsByClientIdDirection(any(), any(), any())).thenReturn(activeSatTims); @@ -448,7 +452,7 @@ public void sendTimToSDW_SingleActiveSatTimFound() { } @Test - public void sendTimToRsus_NoRsusFound() { + public void sendTimToRsus_NoRsusFound() throws IOException { // Arrange when(mockRsuService.getRsusByLatLong(any(), any(), any(), any())).thenReturn(new ArrayList<>()); @@ -468,7 +472,7 @@ public void sendTimToRsus_NoRsusFound() { } @Test - public void sendTimToRsus_RsusFound_NoActiveTIMs() { + public void sendTimToRsus_RsusFound_NoActiveTIMs() throws IOException { // Arrange List rsus = new ArrayList<>(); WydotRsu rsu = new WydotRsu(); @@ -499,7 +503,7 @@ public void sendTimToRsus_RsusFound_NoActiveTIMs() { } @Test - public void sendTimToRsus_RsusFound_ActiveTIMsExist() { + public void sendTimToRsus_RsusFound_ActiveTIMsExist() throws IOException { // Arrange List rsus = new ArrayList<>(); WydotRsu rsu = new WydotRsu(); diff --git a/cv-data-service-library/src/test/resources/com/trihydro/library/service/mockOdeTravelerInformationMessage.json b/cv-data-service-library/src/test/resources/com/trihydro/library/service/mockOdeTravelerInformationMessage.json new file mode 100644 index 00000000..828c86c3 --- /dev/null +++ b/cv-data-service-library/src/test/resources/com/trihydro/library/service/mockOdeTravelerInformationMessage.json @@ -0,0 +1,71 @@ +{ + "msgCnt": "1", + "timeStamp": "2017-08-03T22:25:36.297Z", + "urlB": "null", + "packetID": "EC9C236B0000000000", + "dataframes": [ + { + "startDateTime": "2017-08-02T22:25:00.000Z", + "durationTime": 1, + "doNotUse1": "0", + "frameType": "advisory", + "msgId": { + "roadSignID": { + "position": { + "latitude": "41.678473", + "longitude": "-108.782775", + "elevation": "917.1432" + }, + "viewAngle": "1010101010101010", + "mutcdCode": "warning", + "crc": "0000" + } + }, + "priority": "0", + "doNotUse2": "3", + "regions": [ + { + "name": "Testing TIM", + "regulatorID": "0", + "segmentID": "33", + "anchorPosition": { + "latitude": "41.2500807", + "longitude": "-111.0093847", + "elevation": "2020.6969900289998" + }, + "laneWidth": "7", + "directionality": "3", + "closedPath": "false", + "description": "path", + "path": { + "scale": "0", + "type": "ll", + "nodes": [ + { + "nodeLong": "0.0030982", + "nodeLat": "0.0014562", + "delta": "node-LL3" + }, + { + "nodeLong": "-111.0093847", + "nodeLat": "41.2500807", + "delta": "node-LatLon" + } + ] + }, + "direction": "0000000000001010" + } + ], + "doNotUse4": "2", + "doNotUse3": "3", + "content": "Advisory", + "items": [ + "125", + "some text", + "250", + "'98765" + ], + "url": "null" + } + ] +} \ No newline at end of file From 13adeb181e1e1c2a37d330e769fdfcc39e57ae6a Mon Sep 17 00:00:00 2001 From: dmccoystephenson Date: Wed, 9 Apr 2025 15:26:51 -0600 Subject: [PATCH 8/8] Set ACM_LOG_LEVEL via environment variable for local deployment Updated `docker-compose.yml` to use the `ACM_LOG_LEVEL` value from the `.env` file for better configurability. Added `ACM_LOG_LEVEL` to `sample.env` with a default value of `ERROR`. --- local-deployment/docker-compose.yml | 4 ++-- local-deployment/sample.env | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/local-deployment/docker-compose.yml b/local-deployment/docker-compose.yml index 94a26ea7..d33ed220 100644 --- a/local-deployment/docker-compose.yml +++ b/local-deployment/docker-compose.yml @@ -91,7 +91,7 @@ services: ACM_CONFIG_FILE: adm.properties ACM_LOG_TO_CONSOLE: "true" ACM_LOG_TO_FILE: "false" - ACM_LOG_LEVEL: ERROR + ACM_LOG_LEVEL: ${ACM_LOG_LEVEL} depends_on: - kafka volumes: @@ -109,7 +109,7 @@ services: ACM_CONFIG_FILE: aem.properties ACM_LOG_TO_CONSOLE: "true" ACM_LOG_TO_FILE: "false" - ACM_LOG_LEVEL: ERROR + ACM_LOG_LEVEL: ${ACM_LOG_LEVEL} depends_on: - kafka volumes: diff --git a/local-deployment/sample.env b/local-deployment/sample.env index 435fd31b..3d2c7497 100644 --- a/local-deployment/sample.env +++ b/local-deployment/sample.env @@ -16,4 +16,7 @@ LOGGING_LEVEL_COM_TRIHYDRO=DEBUG REFRESH_CRON_EXPRESSION="0 0 1 * * *" # URI for the Neo4j database (which is not included in the local deployment) -NEO4J_URI=bolt://${DOCKER_HOST_IP}:6687 \ No newline at end of file +NEO4J_URI=bolt://${DOCKER_HOST_IP}:6687 + +# log level of asn1_codec instances +ACM_LOG_LEVEL=ERROR \ No newline at end of file