Merge branch '2.0.x' into 2.1.x

crss-mq-computation/crss-mq-computation-top-sit.yml

@@ -34,7 +34,7 @@ spring:
           authorizationToken: eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJleHAiOjQ2NTI4Mzg3NzAsInVpZCI6ImRjb3NfaGlzdG9yeV9zZXJ2aWNlIn0.aurTiuKJtg_o2sPxbBQUH1MGNoOV0VQjnLmP7ztyqwv70oLOJReM58UN0Hb62HBjmFgb1WJ-5buRdZxwgF9u5PWuSK4dyQXScdC82LkREbBinqtGtAXCxWpAkcGBVAlUEymMhyzGD16BPdfNpXGm7N3EBUnfF2zgZcQpAjwpD7NUJvYeT2dG9zcHpE_cvQG26Fw-qcd3QoOxMBUofceghirFSgVSGMOHotYCLnExquTcLgRbPBfYkFDKAORB-pluyO556KKf348lOTkvGqYBs79c4nJWuR8urQK4KLJQZ6n7H3yMsprXwfhwQ_jc13zcbG7oVVddF_-LXkGmVJqTew
 
 batch:
-  maxWorkers: 15
+  maxWorkers: 10
   partitionSize:
     gap: 20
     mq: 100000
@@ -43,4 +43,5 @@ batch:
 
 logging:
   level:
-    com.pemc.crss: DEBUG
+    com.pemc.crss: DEBUG
+    org.springframework.cloud: DEBUG

crss-settlement-task-calculation/crss-settlement-task-calculation.yml

@@ -6,7 +6,7 @@ spring:
       password: i17SMOPm
       driverClassName: com.edb.Driver
       connectionTimeout: 900000
-      maximumPoolSize: 5
+      maximumPoolSize: 8
       test-on-borrow: true
       validation-query: SELECT 1
   crss-main:
@@ -16,7 +16,7 @@ spring:
       password: D9JpfUtT
       driverClassName: com.edb.Driver
       connectionTimeout: 900000
-      maximumPoolSize: 5
+      maximumPoolSize: 8
       test-on-borrow: true
       validation-query: SELECT 1
   crss-metering:
@@ -83,7 +83,7 @@ spring:
     port: 6379
 
 batch:
-  chunkSize: 100
+  chunkSize: 1000
   maxWorkers: 10
   partitionSize:
     retDat: 300
@@ -98,7 +98,7 @@ batch:
     rta: 900
     rprta: 2000
     rcra: 900
-    sFactor: 100
+    sFactor: 500
     runway: 400
     spotSeller: 1500
     spotBuyer: 1500

crss-settlement-task-file-gen-addtlcomp/crss-settlement-task-file-gen-addtlcomp.yml

@@ -67,7 +67,8 @@ logging:
 
 report:
   directory:
-    base: report/
+    base: /tmp/stl/
+    sftp: report/
 
 sftp:
   credentials:

crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation.yml

@@ -67,6 +67,8 @@ batch:
     amsMf: 1500
     energyStl: 1
     lr: 1
+    energyStlB: 4500
+
 
 logging:
   level: