Skip to content

Commit

Permalink
#1456: Feature/docker config fixes (#247)
Browse files Browse the repository at this point in the history 
* Update docker configs with master, bump patch version, update dependencies, and fix linting errors with Standard

* Update tests

* Clean up

* Clean up
  • Loading branch information
@oderayi
oderayi authored Nov 18, 2020
1 parent 9ac9910 commit d37de6b
Show file tree
Hide file tree
Showing 11 changed files with 1,300 additions and 2,600 deletions.
130 changes: 120 additions & 10 deletions docker/central-ledger/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"HOSTNAME": "http://central-ledger",
"DATABASE": {
"DIALECT": "mysql",
"HOST": "central_ledger",
"HOST": "qs_mysql",
"PORT": 3306,
"USER": "central_ledger",
"PASSWORD": "password",
Expand All @@ -18,7 +18,10 @@
"CREATE_RETRY_INTERVAL_MILLIS": 200,
"DEBUG": false
},
"RUN_MIGRATIONS": true,
"MIGRATIONS": {
"DISABLED": false,
"RUN_DATA_MIGRATIONS": true
},
"AMOUNT": {
"PRECISION": 18,
"SCALE": 4
Expand All @@ -30,9 +33,13 @@
"CONNECT_TIMEOUT": 45000,
"RECONNECT_INTERVAL": 5000
},
"DB_CONNECTION": {
"POOL_MIN": 10,
"POOL_MAX": 30
"MONGODB": {
"DISABLED": true,
"URI": "mongodb://localhost:27017/mlos"
},
"ERROR_HANDLING": {
"includeCauseExtension": true,
"truncateExtensions": false
},
"HANDLERS": {
"DISABLED": false,
Expand Down Expand Up @@ -76,6 +83,12 @@
]
},
"INTERNAL_TRANSFER_VALIDITY_SECONDS": "432000",
"ENABLE_ON_US_TRANSFERS": false,
"CACHE": {
"CACHE_ENABLED": false,
"MAX_BYTE_SIZE": 10000000,
"EXPIRES_IN_MS": 1000
},
"KAFKA": {
"TOPIC_TEMPLATES": {
"PARTICIPANT_TOPIC_TEMPLATE": {
Expand All @@ -88,6 +101,77 @@
}
},
"CONSUMER": {
"BULK": {
"PREPARE": {
"config": {
"options": {
"mode": 2,
"batchSize": 1,
"pollFrequency": 10,
"recursiveTimeout": 100,
"messageCharset": "utf8",
"messageAsJSON": true,
"sync": true,
"consumeTimeout": 1000
},
"rdkafkaConf": {
"client.id": "cl-con-bulk-prepare",
"group.id": "cl-group-bulk-prepare",
"metadata.broker.list": "kafka:9092",
"socket.keepalive.enable": true
},
"topicConf": {
"auto.offset.reset": "earliest"
}
}
},
"PROCESSING": {
"config": {
"options": {
"mode": 2,
"batchSize": 1,
"pollFrequency": 10,
"recursiveTimeout": 100,
"messageCharset": "utf8",
"messageAsJSON": true,
"sync": true,
"consumeTimeout": 1000
},
"rdkafkaConf": {
"client.id": "cl-con-bulk-processing",
"group.id": "cl-group-bulk-processing",
"metadata.broker.list": "kafka:9092",
"socket.keepalive.enable": true
},
"topicConf": {
"auto.offset.reset": "earliest"
}
}
},
"FULFIL": {
"config": {
"options": {
"mode": 2,
"batchSize": 1,
"pollFrequency": 10,
"recursiveTimeout": 100,
"messageCharset": "utf8",
"messageAsJSON": true,
"sync": true,
"consumeTimeout": 1000
},
"rdkafkaConf": {
"client.id": "cl-con-bulk-fulfil",
"group.id": "cl-group-bulk-fulfil",
"metadata.broker.list": "kafka:9092",
"socket.keepalive.enable": true
},
"topicConf": {
"auto.offset.reset": "earliest"
}
}
}
},
"TRANSFER": {
"PREPARE": {
"config": {
Expand Down Expand Up @@ -209,6 +293,27 @@
}
},
"PRODUCER": {
"BULK": {
"PROCESSING": {
"config": {
"options": {
"messageCharset": "utf8"
},
"rdkafkaConf": {
"metadata.broker.list": "kafka:9092",
"client.id": "cl-prod-bulk-processing",
"event_cb": true,
"dr_cb": true,
"socket.keepalive.enable": true,
"queue.buffering.max.messages": 10000000
},
"topicConf": {
"request.required.acks": "all",
"partitioner": "murmur2_random"
}
}
}
},
"TRANSFER": {
"PREPARE": {
"config": {
Expand All @@ -224,7 +329,8 @@
"queue.buffering.max.messages": 10000000
},
"topicConf": {
"request.required.acks": "all"
"request.required.acks": "all",
"partitioner": "murmur2_random"
}
}
},
Expand All @@ -242,7 +348,8 @@
"queue.buffering.max.messages": 10000000
},
"topicConf": {
"request.required.acks": "all"
"request.required.acks": "all",
"partitioner": "murmur2_random"
}
}
},
Expand All @@ -260,7 +367,8 @@
"queue.buffering.max.messages": 10000000
},
"topicConf": {
"request.required.acks": "all"
"request.required.acks": "all",
"partitioner": "murmur2_random"
}
}
}
Expand All @@ -280,7 +388,8 @@
"queue.buffering.max.messages": 10000000
},
"topicConf": {
"request.required.acks": "all"
"request.required.acks": "all",
"partitioner": "murmur2_random"
}
}
}
Expand All @@ -300,7 +409,8 @@
"queue.buffering.max.messages": 10000000
},
"topicConf": {
"request.required.acks": "all"
"request.required.acks": "all",
"partitioner": "murmur2_random"
}
}
}
Expand Down
38 changes: 22 additions & 16 deletions docker/ml-api-adapter/default.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,31 @@
"PORT": 3000,
"HOSTNAME": "http://ml-api-adapter",
"ENDPOINT_SOURCE_URL": "http://central-ledger:3001/participants/{{fsp}}/endpoints",
"ENDPOINT_HEALTH_URL": "http://central-ledger:3001/health",
"ENDPOINT_CACHE_CONFIG": {
"expiresIn": 180000,
"generateTimeout": 30000
},
"ENDPOINT_SECURITY": {
"ENDPOINT_SECURITY":{
"TLS": {
"rejectUnauthorized": true
},
"JWS": {
"JWS_SIGN": false,
"FSPIOP_SOURCE_TO_SIGN": "switch",
"JWS_SIGNING_KEY_PATH": "secrets/jwsSigningKey.key"
}
},
"MAX_CALLBACK_TIME_LAG_DILATION_MILLISECONDS": 200,
"MAX_FULFIL_TIMEOUT_DURATION_SECONDS": 300,
"TRANSFERS": {
"SEND_TRANSFER_CONFIRMATION_TO_PAYEE": true
},
"STRIP_UNKNOWN_HEADERS": false,
"ERROR_HANDLING": {
"includeCauseExtension": false,
"truncateExtensions": true
},
"AMOUNT": {
"PRECISION": 10,
"SCALE": 2
Expand Down Expand Up @@ -39,18 +54,6 @@
"GENERAL_TOPIC_TEMPLATE": {
"TEMPLATE": "topic-{{functionality}}-{{action}}",
"REGEX": "topic-(.*)-(.*)"
},
"NOTIFICATION_TOPIC_TEMPLATE": {
"TEMPLATE": "topic-notification-event",
"REGEX": "topic-notification-event"
},
"FULFIL_TOPIC_TEMPLATE": {
"TEMPLATE": "topic-transfer-fulfil",
"REGEX": "topic-transfer-fulfil"
},
"GET_TRANSFERS_TOPIC_TEMPLATE": {
"TEMPLATE": "topic-transfer-get",
"REGEX": "topic-transfer-get"
}
},
"CONSUMER": {
Expand Down Expand Up @@ -96,7 +99,8 @@
"queue.buffering.max.messages": 10000000
},
"topicConf": {
"request.required.acks": "all"
"request.required.acks": "all",
"partitioner": "murmur2_random"
}
}
},
Expand All @@ -114,7 +118,8 @@
"queue.buffering.max.messages": 10000000
},
"topicConf": {
"request.required.acks": "all"
"request.required.acks": "all",
"partitioner": "murmur2_random"
}
}
},
Expand All @@ -132,7 +137,8 @@
"queue.buffering.max.messages": 10000000
},
"topicConf": {
"request.required.acks": "all"
"request.required.acks": "all",
"partitioner": "murmur2_random"
}
}
}
Expand Down
Loading

0 comments on commit d37de6b

Please sign in to comment.