Merge pull request #108 from samagra-comms/development

Development Merge v2.4.3
samagra-comms · Aug 13, 2024 · 5e07b2c · 5e07b2c
2 parents 0b6546f + 449b480
commit 5e07b2c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -11,15 +11,15 @@
 	</parent>
 	<groupId>com.uci</groupId>
 	<artifactId>inbound</artifactId>
-	<version>2.4.2</version>
+	<version>2.4.3</version>
 	<name>inbound</name>
 	<description>inbound</description>
 
 	<properties>
 		<java.version>11</java.version>
-		<utils.version>2.4.2</utils.version>
-		<dao.version>2.4.2</dao.version>
-		<adapter.version>2.4.2</adapter.version>
+		<utils.version>2.4.3</utils.version>
+		<dao.version>2.4.3</dao.version>
+		<adapter.version>2.4.3</adapter.version>
 	</properties>
 	<!-- For Downloading repositories from github packages -->
 	<repositories>

diff --git a/src/main/java/com/uci/inbound/incoming/CampaignController.java b/src/main/java/com/uci/inbound/incoming/CampaignController.java
@@ -55,15 +55,20 @@ public class CampaignController {
     private long cassInsertErrorCount;
 
     @RequestMapping(value = "/start", method = RequestMethod.GET)
-    public ResponseEntity<String> startCampaign(@RequestParam("campaignId") String campaignId, @RequestParam(value = "page", required = false) String page,
-                                                @RequestHeader(value = "Conversation-Authorization", required = false) String conversationAuthorization) {
+    public ResponseEntity<String> startCampaign(
+            @RequestParam("campaignId") String campaignId,
+            @RequestParam("segment") String segment,
+            @RequestParam(value = "page", required = false) String page,
+            @RequestHeader(value = "Conversation-Authorization", required = false) String conversationAuthorization
+    ) {
         final long startTime = System.nanoTime();
         logTimeTaken(startTime, 0, "process-start: %d ms");
-        log.info("Call campaign service : "+campaignId+" page : "+page);
+        log.info("Call campaign service : " + campaignId +" segment: " + segment + " page : " + page);
         Map<String, String> meta;
         if(page != null && !page.isEmpty()){
             meta = new HashMap<>();
             meta.put("page", page);
+            meta.put("segment", segment);
         } else {
             meta = null;
         }

diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
@@ -24,6 +24,8 @@
             class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- rollover daily and when the file reaches 10 MegaBytes -->
             <fileNamePattern>${LOGS}/archived/inbound-log-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <maxHistory>2</maxHistory>
+            <totalSizeCap>5GB</totalSizeCap>
             <timeBasedFileNamingAndTriggeringPolicy
                 class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <maxFileSize>10MB</maxFileSize>