简柏林 / thingskit · Commits

Commit f5b4ebbd1b0f3d1bd51b4a92e3730beafb110707

Authored by YevhenBondarenko
Committed by Andrew Shvayka
1 parent ebee42a0

refactored

Inline Side-by-side
Showing 6 changed files with 11 additions and 14 deletions
... ... @@ -49,8 +49,8 @@ public class RemoteJsInvokeService extends AbstractJsInvokeService {
49 49 @Value("${queue.js.max_eval_requests_timeout}")
50 50 private long maxEvalRequestsTimeout;
51 51
52   - @Value("${queue.js.max_invoke_requests_timeout}")
53   - private long maxInvokeRequestsTimeout;
  52 + @Value("${queue.js.max_requests_timeout}")
  53 + private long maxRequestsTimeout;
54 54
55 55 @Getter
56 56 @Value("${js.remote.max_errors}")
... ... @@ -90,7 +90,7 @@ public class RemoteJsInvokeService extends AbstractJsInvokeService {
90 90
91 91 @PostConstruct
92 92 public void init() {
93   - super.init(maxInvokeRequestsTimeout);
  93 + super.init(maxRequestsTimeout);
94 94 requestTemplate.init();
95 95 }
96 96
... ... @@ -158,7 +158,7 @@ public class RemoteJsInvokeService extends AbstractJsInvokeService {
158 158 .setScriptIdMSB(scriptId.getMostSignificantBits())
159 159 .setScriptIdLSB(scriptId.getLeastSignificantBits())
160 160 .setFunctionName(functionName)
161   - .setTimeout((int) maxInvokeRequestsTimeout)
  161 + .setTimeout((int) maxRequestsTimeout)
162 162 .setScriptBody(scriptIdToBodysMap.get(scriptId));
163 163
164 164 for (Object arg : args) {
... ... @@ -170,8 +170,8 @@ public class RemoteJsInvokeService extends AbstractJsInvokeService {
170 170 .build();
171 171
172 172 ListenableFuture<TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse>> future = requestTemplate.send(new TbProtoJsQueueMsg<>(UUID.randomUUID(), jsRequestWrapper));
173   - if (maxInvokeRequestsTimeout > 0) {
174   - future = Futures.withTimeout(future, maxInvokeRequestsTimeout, TimeUnit.MILLISECONDS, timeoutExecutorService);
  173 + if (maxRequestsTimeout > 0) {
  174 + future = Futures.withTimeout(future, maxRequestsTimeout, TimeUnit.MILLISECONDS, timeoutExecutorService);
175 175 }
176 176 queuePushedMsgs.incrementAndGet();
177 177 Futures.addCallback(future, new FutureCallback<TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse>>() {
... ... @@ -213,8 +213,8 @@ public class RemoteJsInvokeService extends AbstractJsInvokeService {
213 213 .build();
214 214
215 215 ListenableFuture<TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse>> future = requestTemplate.send(new TbProtoJsQueueMsg<>(UUID.randomUUID(), jsRequestWrapper));
216   - if (maxInvokeRequestsTimeout > 0) {
217   - future = Futures.withTimeout(future, maxInvokeRequestsTimeout, TimeUnit.MILLISECONDS, timeoutExecutorService);
  216 + if (maxRequestsTimeout > 0) {
  217 + future = Futures.withTimeout(future, maxRequestsTimeout, TimeUnit.MILLISECONDS, timeoutExecutorService);
218 218 }
219 219 JsInvokeProtos.RemoteJsResponse response = future.get().getValue();
220 220
... ...
... ... @@ -670,8 +670,8 @@ queue:
670 670 max_pending_requests: "${REMOTE_JS_MAX_PENDING_REQUESTS:10000}"
671 671 # JS Eval max request timeout
672 672 max_eval_requests_timeout: "${REMOTE_JS_MAX_EVAL_REQUEST_TIMEOUT:60000}"
673   - # JS Invoke max request timeout
674   - max_invoke_requests_timeout: "${REMOTE_JS_MAX_INVOKE_REQUEST_TIMEOUT:10000}"
  673 + # JS max request timeout
  674 + max_requests_timeout: "${REMOTE_JS_MAX_REQUEST_TIMEOUT:10000}"
675 675 # JS response poll interval
676 676 response_poll_interval: "${REMOTE_JS_RESPONSE_POLL_INTERVAL_MS:25}"
677 677 # JS response auto commit interval
... ...
... ... @@ -37,6 +37,6 @@ public class TbQueueRemoteJsInvokeSettings {
37 37 @Value("${queue.js.response_auto_commit_interval}")
38 38 private int autoCommitInterval;
39 39
40   - @Value("${queue.js.max_invoke_requests_timeout}")
  40 + @Value("${queue.js.max_requests_timeout}")
41 41 private long maxRequestsTimeout;
42 42 }
... ...
... ... @@ -2,4 +2,3 @@ TB_QUEUE_TYPE=aws-sqs
2 2 TB_QUEUE_AWS_SQS_ACCESS_KEY_ID=YOUR_KEY
3 3 TB_QUEUE_AWS_SQS_SECRET_ACCESS_KEY=YOUR_SECRET
4 4 TB_QUEUE_AWS_SQS_REGION=YOUR_REGION
5   -REMOTE_JS_MAX_INVOKE_REQUEST_TIMEOUT=60000
... ...
1 1 TB_QUEUE_TYPE=pubsub
2 2 TB_QUEUE_PUBSUB_PROJECT_ID=YOUR_PROJECT_ID
3 3 TB_QUEUE_PUBSUB_SERVICE_ACCOUNT=YOUR_SERVICE_ACCOUNT
4   -REMOTE_JS_MAX_INVOKE_REQUEST_TIMEOUT=60000
... ...
... ... @@ -2,4 +2,3 @@ TB_QUEUE_TYPE=service-bus
2 2 TB_QUEUE_SERVICE_BUS_NAMESPACE_NAME=YOUR_NAMESPACE_NAME
3 3 TB_QUEUE_SERVICE_BUS_SAS_KEY_NAME=YOUR_SAS_KEY_NAME
4 4 TB_QUEUE_SERVICE_BUS_SAS_KEY=YOUR_SAS_KEY
5   -REMOTE_JS_MAX_INVOKE_REQUEST_TIMEOUT=60000
... ...