Commit 0ede9eee82d37c4b0494e2cfe196fe5008cd0d41

Authored by Andrew Shvayka
1 parent 8287f972

Few minor improvements

... ... @@ -66,10 +66,7 @@ public class DefaultActorService implements ActorService {
66 66 public static final String APP_DISPATCHER_NAME = "app-dispatcher";
67 67 public static final String CORE_DISPATCHER_NAME = "core-dispatcher";
68 68 public static final String SYSTEM_RULE_DISPATCHER_NAME = "system-rule-dispatcher";
69   - public static final String SYSTEM_PLUGIN_DISPATCHER_NAME = "system-plugin-dispatcher";
70 69 public static final String TENANT_RULE_DISPATCHER_NAME = "rule-dispatcher";
71   - public static final String TENANT_PLUGIN_DISPATCHER_NAME = "plugin-dispatcher";
72   - public static final String SESSION_DISPATCHER_NAME = "session-dispatcher";
73 70 public static final String RPC_DISPATCHER_NAME = "rpc-dispatcher";
74 71
75 72 @Autowired
... ... @@ -186,8 +183,8 @@ public class DefaultActorService implements ActorService {
186 183 @Override
187 184 public void onReceivedMsg(ServerAddress source, ClusterAPIProtos.ClusterMessage msg) {
188 185 ServerAddress serverAddress = new ServerAddress(source.getHost(), source.getPort(), source.getServerType());
189   - log.info("Received msg [{}] from [{}]", msg.getMessageType().name(), serverAddress);
190 186 if (log.isDebugEnabled()) {
  187 + log.info("Received msg [{}] from [{}]", msg.getMessageType().name(), serverAddress);
191 188 log.info("MSG: ", msg);
192 189 }
193 190 switch (msg.getMessageType()) {
... ...
... ... @@ -92,7 +92,7 @@ core-dispatcher {
92 92 throughput = 5
93 93 }
94 94
95   -# This dispatcher is used for system rule actors
  95 +# This dispatcher is used for system rule chains and rule node actors
96 96 system-rule-dispatcher {
97 97 type = Dispatcher
98 98 executor = "fork-join-executor"
... ... @@ -115,30 +115,7 @@ system-rule-dispatcher {
115 115 throughput = 5
116 116 }
117 117
118   -# This dispatcher is used for system plugin actors
119   -system-plugin-dispatcher {
120   - type = Dispatcher
121   - executor = "fork-join-executor"
122   - fork-join-executor {
123   - # Min number of threads to cap factor-based parallelism number to
124   - parallelism-min = 2
125   - # Max number of threads to cap factor-based parallelism number to
126   - parallelism-max = 12
127   -
128   - # The parallelism factor is used to determine thread pool size using the
129   - # following formula: ceil(available processors * factor). Resulting size
130   - # is then bounded by the parallelism-min and parallelism-max values.
131   - parallelism-factor = 0.25
132   - }
133   - # How long time the dispatcher will wait for new actors until it shuts down
134   - shutdown-timeout = 1s
135   -
136   - # Throughput defines the number of messages that are processed in a batch
137   - # before the thread is returned to the pool. Set to 1 for as fair as possible.
138   - throughput = 5
139   -}
140   -
141   -# This dispatcher is used for tenant rule actors
  118 +# This dispatcher is used for tenant rule chains and rule node actors
142 119 rule-dispatcher {
143 120 type = Dispatcher
144 121 executor = "fork-join-executor"
... ... @@ -160,50 +137,3 @@ rule-dispatcher {
160 137 # before the thread is returned to the pool. Set to 1 for as fair as possible.
161 138 throughput = 5
162 139 }
163   -
164   -# This dispatcher is used for tenant plugin actors
165   -plugin-dispatcher {
166   - type = Dispatcher
167   - executor = "fork-join-executor"
168   - fork-join-executor {
169   - # Min number of threads to cap factor-based parallelism number to
170   - parallelism-min = 2
171   - # Max number of threads to cap factor-based parallelism number to
172   - parallelism-max = 12
173   -
174   - # The parallelism factor is used to determine thread pool size using the
175   - # following formula: ceil(available processors * factor). Resulting size
176   - # is then bounded by the parallelism-min and parallelism-max values.
177   - parallelism-factor = 0.25
178   - }
179   - # How long time the dispatcher will wait for new actors until it shuts down
180   - shutdown-timeout = 1s
181   -
182   - # Throughput defines the number of messages that are processed in a batch
183   - # before the thread is returned to the pool. Set to 1 for as fair as possible.
184   - throughput = 5
185   -}
186   -
187   -
188   -# This dispatcher is used for rule actors
189   -session-dispatcher {
190   - type = Dispatcher
191   - executor = "fork-join-executor"
192   - fork-join-executor {
193   - # Min number of threads to cap factor-based parallelism number to
194   - parallelism-min = 2
195   - # Max number of threads to cap factor-based parallelism number to
196   - parallelism-max = 12
197   -
198   - # The parallelism factor is used to determine thread pool size using the
199   - # following formula: ceil(available processors * factor). Resulting size
200   - # is then bounded by the parallelism-min and parallelism-max values.
201   - parallelism-factor = 0.25
202   - }
203   - # How long time the dispatcher will wait for new actors until it shuts down
204   - shutdown-timeout = 1s
205   -
206   - # Throughput defines the number of messages that are processed in a batch
207   - # before the thread is returned to the pool. Set to 1 for as fair as possible.
208   - throughput = 5
209   -}
\ No newline at end of file
... ...
... ... @@ -37,7 +37,7 @@ public class TbMsgGeneratorNodeConfiguration implements NodeConfiguration<TbMsgG
37 37 configuration.setPeriodInSeconds(1);
38 38 configuration.setJsScript("var msg = { temp: 42, humidity: 77 };\n" +
39 39 "var metadata = { data: 40 };\n" +
40   - "var msgType = \"DebugMsg\";\n\n" +
  40 + "var msgType = \"POST_TELEMETRY_REQUEST\";\n\n" +
41 41 "return { msg: msg, metadata: metadata, msgType: msgType };");
42 42 return configuration;
43 43 }
... ...
... ... @@ -98,7 +98,7 @@
98 98 validate-content="false"
99 99 ng-readonly="true"
100 100 fill-height="true">
101   - </tb-json-content>generateReport
  101 + </tb-json-content>
102 102 </div>
103 103 </div>
104 104 </div>
... ...