dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	tools/src/test/scala/org/thingsboard/client/tools/MqttSimulation.scala
This commit is contained in:
volodymyr-babak 2017-01-06 16:49:18 +02:00
commit 392c65ef6e
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
application/src/main/resources/actor-system.conf
View File

@ -29,9 +29,9 @@ app-dispatcher {
executor = "fork-join-executor" executor = "fork-join-executor"
fork-join-executor { fork-join-executor {
# Min number of threads to cap factor-based parallelism number to # Min number of threads to cap factor-based parallelism number to
parallelism-min = 2 parallelism-min = 1
# Max number of threads to cap factor-based parallelism number to # Max number of threads to cap factor-based parallelism number to
parallelism-max = 12 parallelism-max = 1
# The parallelism factor is used to determine thread pool size using the # The parallelism factor is used to determine thread pool size using the
# following formula: ceil(available processors * factor). Resulting size # following formula: ceil(available processors * factor). Resulting size
@ -54,7 +54,7 @@ rpc-dispatcher {
# Min number of threads to cap factor-based parallelism number to # Min number of threads to cap factor-based parallelism number to
parallelism-min = 2 parallelism-min = 2
# Max number of threads to cap factor-based parallelism number to # Max number of threads to cap factor-based parallelism number to
parallelism-max = 12 parallelism-max = 8
# The parallelism factor is used to determine thread pool size using the # The parallelism factor is used to determine thread pool size using the
# following formula: ceil(available processors * factor). Resulting size # following formula: ceil(available processors * factor). Resulting size
@ -82,7 +82,7 @@ core-dispatcher {
# The parallelism factor is used to determine thread pool size using the # The parallelism factor is used to determine thread pool size using the
# following formula: ceil(available processors * factor). Resulting size # following formula: ceil(available processors * factor). Resulting size
# is then bounded by the parallelism-min and parallelism-max values. # is then bounded by the parallelism-min and parallelism-max values.
parallelism-factor = 1.0 parallelism-factor = 0.25
} }
# How long time the dispatcher will wait for new actors until it shuts down # How long time the dispatcher will wait for new actors until it shuts down
shutdown-timeout = 1s shutdown-timeout = 1s
@ -105,7 +105,7 @@ rule-dispatcher {
# The parallelism factor is used to determine thread pool size using the # The parallelism factor is used to determine thread pool size using the
# following formula: ceil(available processors * factor). Resulting size # following formula: ceil(available processors * factor). Resulting size
# is then bounded by the parallelism-min and parallelism-max values. # is then bounded by the parallelism-min and parallelism-max values.
parallelism-factor = 1.0 parallelism-factor = 0.25
} }
# How long time the dispatcher will wait for new actors until it shuts down # How long time the dispatcher will wait for new actors until it shuts down
shutdown-timeout = 1s shutdown-timeout = 1s
@ -128,7 +128,7 @@ plugin-dispatcher {
# The parallelism factor is used to determine thread pool size using the # The parallelism factor is used to determine thread pool size using the
# following formula: ceil(available processors * factor). Resulting size # following formula: ceil(available processors * factor). Resulting size
# is then bounded by the parallelism-min and parallelism-max values. # is then bounded by the parallelism-min and parallelism-max values.
parallelism-factor = 1.0 parallelism-factor = 0.25
} }
# How long time the dispatcher will wait for new actors until it shuts down # How long time the dispatcher will wait for new actors until it shuts down
shutdown-timeout = 1s shutdown-timeout = 1s
@ -152,7 +152,7 @@ session-dispatcher {
# The parallelism factor is used to determine thread pool size using the # The parallelism factor is used to determine thread pool size using the
# following formula: ceil(available processors * factor). Resulting size # following formula: ceil(available processors * factor). Resulting size
# is then bounded by the parallelism-min and parallelism-max values. # is then bounded by the parallelism-min and parallelism-max values.
parallelism-factor = 1.0 parallelism-factor = 0.25
} }
# How long time the dispatcher will wait for new actors until it shuts down # How long time the dispatcher will wait for new actors until it shuts down
shutdown-timeout = 1s shutdown-timeout = 1s

2
application/src/main/resources/thingsboard.yml
View File

@ -167,7 +167,7 @@ actors:
# Cache parameters # Cache parameters
cache: cache:
# Enable/disable cache functionality. # Enable/disable cache functionality.
enabled: "${CACHE_ENABLED:true}" enabled: "${CACHE_ENABLED:false}"
device_credentials: device_credentials:
# Default time to store device credentials in cache, in seconds # Default time to store device credentials in cache, in seconds
time_to_live: "${CACHE_DEVICE_CREDENTIAL_TTL:3600}" time_to_live: "${CACHE_DEVICE_CREDENTIAL_TTL:3600}"

4
tools/src/main/java/org/thingsboard/client/tools/TestParams.java
View File

@ -26,9 +26,9 @@ import java.util.concurrent.TimeUnit;
@Slf4j @Slf4j
public class TestParams { public class TestParams {
static final String TEST_PROPERTIES = "test.properties"; static final String TEST_PROPERTIES = "test.properties";
static final long DEFAULT_TEST_DURATION = TimeUnit.MINUTES.toMillis(1); static final long DEFAULT_TEST_DURATION = TimeUnit.SECONDS.toMillis(1);
static final long DEFAULT_TEST_INTERVAL = TimeUnit.MILLISECONDS.toMillis(100); static final long DEFAULT_TEST_INTERVAL = TimeUnit.MILLISECONDS.toMillis(100);
static final int DEFAULT_DEVICE_COUNT = 25; static final int DEFAULT_DEVICE_COUNT = 2000;
static final String DEFAULT_REST_URL = "http://localhost:8080"; static final String DEFAULT_REST_URL = "http://localhost:8080";
static final String DEFAULT_MQTT_URLS = "tcp://localhost:1883"; static final String DEFAULT_MQTT_URLS = "tcp://localhost:1883";
static final String DEFAULT_USERNAME = "tenant@thingsboard.org"; static final String DEFAULT_USERNAME = "tenant@thingsboard.org";

1
tools/src/main/resources/logback.xml
View File

@ -25,6 +25,7 @@
</encoder> </encoder>
</appender> </appender>
<logger name="io.gatling.core.action.Pause" level="WARN"/>
<logger name="org.thingsboard" level="INFO" /> <logger name="org.thingsboard" level="INFO" />
<root level="INFO"> <root level="INFO">

1
transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportService.java
View File

@ -76,7 +76,6 @@ public class MqttTransportService {
@PostConstruct @PostConstruct
public void init() throws Exception { public void init() throws Exception {
ResourceLeakDetector.setLevel(ResourceLeakDetector.Level.ADVANCED);
log.info("Starting MQTT transport..."); log.info("Starting MQTT transport...");
log.info("Lookup MQTT transport adaptor {}", adaptorName); log.info("Lookup MQTT transport adaptor {}", adaptorName);
this.adaptor = (MqttTransportAdaptor) appContext.getBean(adaptorName); this.adaptor = (MqttTransportAdaptor) appContext.getBean(adaptorName);