Browse Source

Fixes to configuration

pull/1150/head
Andrew Shvayka 8 years ago
parent
commit
7ba82aef3b
  1. 6
      application/src/main/java/org/thingsboard/server/service/script/NashornJsInvokeService.java
  2. 8
      common/queue/src/main/java/org/thingsboard/server/kafka/TbKafkaRequestTemplate.java
  3. 4
      common/queue/src/main/java/org/thingsboard/server/kafka/TbKafkaSettings.java

6
application/src/main/java/org/thingsboard/server/service/script/NashornJsInvokeService.java

@ -29,13 +29,13 @@ public class NashornJsInvokeService extends AbstractNashornJsInvokeService {
@Value("${js.local.use_js_sandbox}") @Value("${js.local.use_js_sandbox}")
private boolean useJsSandbox; private boolean useJsSandbox;
@Value("${js.local.js_sandbox.monitor_thread_pool_size}") @Value("${js.local.monitor_thread_pool_size}")
private int monitorThreadPoolSize; private int monitorThreadPoolSize;
@Value("${js.local.js_sandbox.max_cpu_time}") @Value("${js.local.max_cpu_time}")
private long maxCpuTime; private long maxCpuTime;
@Value("${js.local.js_sandbox.max_errors}") @Value("${js.local.max_errors}")
private int maxErrors; private int maxErrors;
@Override @Override

8
common/queue/src/main/java/org/thingsboard/server/kafka/TbKafkaRequestTemplate.java

@ -1,12 +1,12 @@
/** /**
* Copyright © 2016-2018 The Thingsboard Authors * Copyright © 2016-2018 The Thingsboard Authors
* <p> *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* <p> *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* <p> *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

4
common/queue/src/main/java/org/thingsboard/server/kafka/TbKafkaSettings.java

@ -36,7 +36,7 @@ public class TbKafkaSettings {
public static final String RESPONSE_TOPIC_HEADER = "responseTopic"; public static final String RESPONSE_TOPIC_HEADER = "responseTopic";
@Value("${kafka.bootstrap.server}") @Value("${kafka.bootstrap.servers}")
private String servers; private String servers;
@Value("${kafka.acks}") @Value("${kafka.acks}")
@ -54,7 +54,7 @@ public class TbKafkaSettings {
@Value("${kafka.buffer.memory}") @Value("${kafka.buffer.memory}")
private long bufferMemory; private long bufferMemory;
@Value("${kafka.other:null}") @Value("${kafka.other:#{null}}")
private List<TbKafkaProperty> other; private List<TbKafkaProperty> other;
public Properties toProps() { public Properties toProps() {

Loading…
Cancel
Save