rsmp 0.13.0 → 0.13.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +2 -2
- data/lib/rsmp/site_proxy.rb +12 -10
- data/lib/rsmp/supervisor_proxy.rb +4 -0
- data/lib/rsmp/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c1840c079564613302ef539e2c0a502c2cafdabe8c875ab2dfb3b389470becf8
|
4
|
+
data.tar.gz: 35eda6efcfabe4624ba58d5150b3c1263a34a2a0b1f363b1a704566acc65cfed
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 32c6bb82731643e24000e2056a19896fa591755b1336ccad74df28b82ee9800cdb16ee96e6d6e1996e09137fa22cfed5c64801d8b131953a4abc94d32ba9ab08
|
7
|
+
data.tar.gz: d588d1e92eb16473ee86e25e0a595d6bd03c4744f113860bbe89be6f3c3df6ab19bb522daea617f28e8b32708a048d4a2895700cda8de34fed6fd986de85c6a4
|
data/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
rsmp (0.13.
|
4
|
+
rsmp (0.13.1)
|
5
5
|
async (~> 1.29.1)
|
6
6
|
async-io (~> 1.32.2)
|
7
7
|
colorize (~> 0.8.1)
|
@@ -79,7 +79,7 @@ GEM
|
|
79
79
|
multi_test (0.1.2)
|
80
80
|
nio4r (2.5.8)
|
81
81
|
rake (13.0.6)
|
82
|
-
regexp_parser (2.
|
82
|
+
regexp_parser (2.3.1)
|
83
83
|
rsmp_schemer (0.4.0)
|
84
84
|
json_schemer (~> 0.2.18)
|
85
85
|
rspec (3.10.0)
|
data/lib/rsmp/site_proxy.rb
CHANGED
@@ -116,8 +116,8 @@ module RSMP
|
|
116
116
|
m_id = options[:m_id] || RSMP::Message.make_m_id
|
117
117
|
|
118
118
|
message = RSMP::AggregatedStatusRequest.new({
|
119
|
-
"ntsOId" =>
|
120
|
-
"xNId" =>
|
119
|
+
"ntsOId" => @ntsOId,
|
120
|
+
"xNId" => @xNId,
|
121
121
|
"cId" => component,
|
122
122
|
"mId" => m_id
|
123
123
|
})
|
@@ -187,8 +187,8 @@ module RSMP
|
|
187
187
|
request_list = status_list.map { |item| item.slice('sCI','n') }
|
188
188
|
|
189
189
|
message = RSMP::StatusRequest.new({
|
190
|
-
"ntsOId" =>
|
191
|
-
"xNId" =>
|
190
|
+
"ntsOId" => @ntsOId,
|
191
|
+
"xNId" => @xNId,
|
192
192
|
"cId" => component,
|
193
193
|
"sS" => request_list,
|
194
194
|
"mId" => m_id
|
@@ -232,8 +232,8 @@ module RSMP
|
|
232
232
|
component.allow_repeat_updates subscribe_list
|
233
233
|
|
234
234
|
message = RSMP::StatusSubscribe.new({
|
235
|
-
"ntsOId" =>
|
236
|
-
"xNId" =>
|
235
|
+
"ntsOId" => @ntsOId,
|
236
|
+
"xNId" => @xNId,
|
237
237
|
"cId" => component_id,
|
238
238
|
"sS" => subscribe_list,
|
239
239
|
'mId' => m_id
|
@@ -262,8 +262,8 @@ module RSMP
|
|
262
262
|
end
|
263
263
|
|
264
264
|
message = RSMP::StatusUnsubscribe.new({
|
265
|
-
"ntsOId" =>
|
266
|
-
"xNId" =>
|
265
|
+
"ntsOId" => @ntsOId,
|
266
|
+
"xNId" => @xNId,
|
267
267
|
"cId" => component_id,
|
268
268
|
"sS" => status_list
|
269
269
|
})
|
@@ -292,8 +292,8 @@ module RSMP
|
|
292
292
|
validate_ready 'send command'
|
293
293
|
m_id = options[:m_id] || RSMP::Message.make_m_id
|
294
294
|
message = RSMP::CommandRequest.new({
|
295
|
-
"ntsOId" =>
|
296
|
-
"xNId" =>
|
295
|
+
"ntsOId" => @ntsOId,
|
296
|
+
"xNId" => @xNId,
|
297
297
|
"cId" => component,
|
298
298
|
"arg" => command_list,
|
299
299
|
"mId" => m_id
|
@@ -369,6 +369,8 @@ module RSMP
|
|
369
369
|
@site_settings = find_site_settings @site_id
|
370
370
|
if @site_settings
|
371
371
|
@sxl = @site_settings['sxl']
|
372
|
+
@ntsOId = @site_settings['ntsOId']
|
373
|
+
@xNId = @site_settings['xNId']
|
372
374
|
setup_components @site_settings['components']
|
373
375
|
else
|
374
376
|
dont_acknowledge message, 'Rejected', "No config found for site #{@site_id}"
|
@@ -15,6 +15,8 @@ module RSMP
|
|
15
15
|
@port = options[:port]
|
16
16
|
@status_subscriptions = {}
|
17
17
|
@sxl = @site_settings['sxl']
|
18
|
+
@ntsOId = @site_settings['ntsOId']
|
19
|
+
@xNId = @site_settings['xNId']
|
18
20
|
@synthetic_id = Supervisor.build_id_from_ip_port @ip, @port
|
19
21
|
end
|
20
22
|
|
@@ -160,6 +162,8 @@ module RSMP
|
|
160
162
|
"se" => component.aggregated_status_bools,
|
161
163
|
"mId" => m_id,
|
162
164
|
})
|
165
|
+
message.attributes['ntsOId'] = @site_settings['ntsOId'] if @site_settings['ntsOId']
|
166
|
+
message.attributes['xNId'] = @site_settings['xNId'] if @site_settings['xNId']
|
163
167
|
|
164
168
|
send_and_optionally_collect message, options do |collect_options|
|
165
169
|
Collector.new self, collect_options.merge(task:@task, type: 'MessageAck')
|
data/lib/rsmp/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rsmp
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.13.
|
4
|
+
version: 0.13.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Emil Tin
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-04-
|
11
|
+
date: 2022-04-26 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: async
|