rsmp 0.11.6 → 0.11.7
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/lib/rsmp/proxy.rb +0 -1
- data/lib/rsmp/site_proxy.rb +16 -5
- data/lib/rsmp/supervisor_proxy.rb +5 -6
- 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: 85f5c9ffaa15773f1f5e6722bd93fcf8ecff524166859bafec85e6871a285330
|
4
|
+
data.tar.gz: 90f8edb63fb20d324885c9e9b15c5bde49bcbdc80086fa48c36fd4c78b183475
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 01c22ef28ddbaedcf45d7c24518d1cf9ffe190f434c0e8e0e07a9e7d12f6333ea5ccc16f2532502755d1efa6619e9a2c7d73e462aeed9ea75f93deb55e4cb0ab
|
7
|
+
data.tar.gz: ebca1461398deacd9ff211e0bbc24c4586e286d46806c8b62718a36eaf41b5b53c2cef5a6f1882b81d4009778172a0173bf390812478e47bca86927465bde179
|
data/Gemfile.lock
CHANGED
data/lib/rsmp/proxy.rb
CHANGED
data/lib/rsmp/site_proxy.rb
CHANGED
@@ -47,7 +47,8 @@ module RSMP
|
|
47
47
|
def handshake_complete
|
48
48
|
super
|
49
49
|
sanitized_sxl_version = RSMP::Schemer.sanitize_version(@site_sxl_version)
|
50
|
-
log "Connection to site #{@site_id} established, using core #{@rsmp_version}, #{@sxl} #{sanitized_sxl_version}", level: :
|
50
|
+
log "Connection to site #{@site_id} established, using core #{@rsmp_version}, #{@sxl} #{sanitized_sxl_version}", level: :log
|
51
|
+
start_watchdog
|
51
52
|
end
|
52
53
|
|
53
54
|
def process_message message
|
@@ -91,6 +92,20 @@ module RSMP
|
|
91
92
|
@version_determined = true
|
92
93
|
end
|
93
94
|
|
95
|
+
def acknowledged_first_ingoing message
|
96
|
+
case message.type
|
97
|
+
when "Watchdog"
|
98
|
+
send_watchdog
|
99
|
+
end
|
100
|
+
end
|
101
|
+
|
102
|
+
def acknowledged_first_outgoing message
|
103
|
+
case message.type
|
104
|
+
when "Watchdog"
|
105
|
+
handshake_complete
|
106
|
+
end
|
107
|
+
end
|
108
|
+
|
94
109
|
def validate_ready action
|
95
110
|
raise NotReady.new("Can't #{action} because connection is not ready. (Currently #{@state})") unless ready?
|
96
111
|
end
|
@@ -152,14 +167,10 @@ module RSMP
|
|
152
167
|
end
|
153
168
|
|
154
169
|
def version_acknowledged
|
155
|
-
handshake_complete
|
156
170
|
end
|
157
171
|
|
158
172
|
def process_watchdog message
|
159
173
|
super
|
160
|
-
if @watchdog_started == false
|
161
|
-
start_watchdog
|
162
|
-
end
|
163
174
|
end
|
164
175
|
|
165
176
|
def site_ids_changed
|
@@ -82,10 +82,11 @@ module RSMP
|
|
82
82
|
end
|
83
83
|
|
84
84
|
def handshake_complete
|
85
|
-
super
|
86
85
|
sanitized_sxl_version = RSMP::Schemer.sanitize_version(sxl_version)
|
87
86
|
log "Connection to supervisor established, using core #{@rsmp_version}, #{sxl} #{sanitized_sxl_version}", level: :info
|
88
87
|
start_watchdog
|
88
|
+
send_all_aggregated_status if @site_settings['send_after_connect']
|
89
|
+
super
|
89
90
|
end
|
90
91
|
|
91
92
|
def process_message message
|
@@ -120,10 +121,8 @@ module RSMP
|
|
120
121
|
# aggregateds status should only be send for later version of rsmp
|
121
122
|
# to handle verison differences, we probably need inherited classes
|
122
123
|
case message.type
|
123
|
-
|
124
|
-
|
125
|
-
send_all_aggregated_status
|
126
|
-
end
|
124
|
+
when "Watchdog"
|
125
|
+
handshake_complete
|
127
126
|
end
|
128
127
|
end
|
129
128
|
|
@@ -148,8 +147,8 @@ module RSMP
|
|
148
147
|
log "Received Version message, using RSMP #{@rsmp_version}", message: message, level: :log
|
149
148
|
start_timer
|
150
149
|
acknowledge message
|
151
|
-
handshake_complete
|
152
150
|
@version_determined = true
|
151
|
+
send_watchdog
|
153
152
|
end
|
154
153
|
|
155
154
|
def send_aggregated_status component, options={}
|
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.11.
|
4
|
+
version: 0.11.7
|
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-03-
|
11
|
+
date: 2022-03-25 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: async
|