dendrite 0.5.20 → 0.5.21
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/conf/services/service.yml +3 -0
- data/lib/dendrite/generators/nerve.rb +16 -1
- data/lib/dendrite/version.rb +1 -1
- data/lib/dendrite.rb +4 -0
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: ad3a69ef540b8fa4f9781b52aab194af7ada4fa3
|
|
4
|
+
data.tar.gz: cd4c84d4d0876a0ad3d7b1120cbe7891ad2658f6
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 79f03b9792ebfaffcb29b363874893e27e10ba0bd007f87482ea6504389d3ad369bf9aaa032e26638cba1a1e1ab00117cbf8d818c05932fd99df1b338831e05b
|
|
7
|
+
data.tar.gz: 2a0528dd9f212743e622d7b0c7a69c15e0c7db9735a08d70fef036be8d763031d969ebf911e2b9db6c273f2b9237307883c3669eb7ff73b79c132d697d9a1de4
|
data/conf/services/service.yml
CHANGED
|
@@ -54,7 +54,22 @@ module Dendrite
|
|
|
54
54
|
dc: Dendrite::Config.dc,
|
|
55
55
|
env: Dendrite::Config.env
|
|
56
56
|
}
|
|
57
|
-
}.merge(zookeeper_config)
|
|
57
|
+
}.merge(zookeeper_config).merge(check_config)
|
|
58
|
+
end
|
|
59
|
+
|
|
60
|
+
def check_config
|
|
61
|
+
return {} if not (service.service_port && service.telemetry && service.telemetry.health_url)
|
|
62
|
+
{
|
|
63
|
+
check_interval: Dendrite::Config.default_check_time,
|
|
64
|
+
checks: [{
|
|
65
|
+
type: "http"
|
|
66
|
+
host: Dendrite::Config.public_ip,
|
|
67
|
+
port: service.service_port,
|
|
68
|
+
uri: service.telemetry.health_url,
|
|
69
|
+
rise: 3,
|
|
70
|
+
fall: 2
|
|
71
|
+
}]
|
|
72
|
+
}
|
|
58
73
|
end
|
|
59
74
|
|
|
60
75
|
def zookeeper_config
|
data/lib/dendrite/version.rb
CHANGED
data/lib/dendrite.rb
CHANGED
|
@@ -88,6 +88,10 @@ module Dendrite
|
|
|
88
88
|
@@data[:dendrite][:bind_to_all] != nil
|
|
89
89
|
end
|
|
90
90
|
|
|
91
|
+
def default_check_time
|
|
92
|
+
@@data[:dendrite][:check_internal] || 5
|
|
93
|
+
end
|
|
94
|
+
|
|
91
95
|
def public_ip
|
|
92
96
|
ip = Socket.ip_address_list.detect{|intf| intf.ipv4_private?} ||
|
|
93
97
|
Socket.ip_address_list.detect{|intf| intf.ipv4? && !intf.ipv4_loopback? && !intf.ipv4_multicast? && !intf.ipv4_private?}
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: dendrite
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.5.
|
|
4
|
+
version: 0.5.21
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Yagnik
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-
|
|
11
|
+
date: 2017-03-31 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|