dendrite 0.5.20 → 0.5.21

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 7bf4b1fdc08a024b3a13ce91325cf5cf2dc8ee7a
4
- data.tar.gz: 41723c08f763f7aa8e4be85e780cb21375ca8ba7
3
+ metadata.gz: ad3a69ef540b8fa4f9781b52aab194af7ada4fa3
4
+ data.tar.gz: cd4c84d4d0876a0ad3d7b1120cbe7891ad2658f6
5
5
  SHA512:
6
- metadata.gz: 2632a11b89af6cb462cb1ea725f46895d19141993cceb35e1896d488c7f75077a7d680cdadad53d450c1c02c9534cf31960eca1952583c2c2ea4e5acc799c8c2
7
- data.tar.gz: 2de9a065d1e4e1a3f5bd2a0a8d2f646e6d03c26fe709f060c37f54885fb19f3610912ce9bffab6a40201522885ec9fea878fa6daca24c4beb45e5a8ba63abe4a
6
+ metadata.gz: 79f03b9792ebfaffcb29b363874893e27e10ba0bd007f87482ea6504389d3ad369bf9aaa032e26638cba1a1e1ab00117cbf8d818c05932fd99df1b338831e05b
7
+ data.tar.gz: 2a0528dd9f212743e622d7b0c7a69c15e0c7db9735a08d70fef036be8d763031d969ebf911e2b9db6c273f2b9237307883c3669eb7ff73b79c132d697d9a1de4
@@ -50,6 +50,9 @@ subcomponents:
50
50
  sticky_session: sessionkey
51
51
  - name: cat
52
52
  type: mysql
53
+ telemetry:
54
+ health_url: /
55
+ notification_email: foo@bar.com
53
56
  deploy:
54
57
  repository: git@github.com:yagnik/dendrite
55
58
  package: dendrite
@@ -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
@@ -1,3 +1,3 @@
1
1
  module Dendrite
2
- VERSION = "0.5.20"
2
+ VERSION = "0.5.21"
3
3
  end
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.20
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-01-31 00:00:00.000000000 Z
11
+ date: 2017-03-31 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler