synapse 0.15.0 → 0.15.1

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.
Files changed (6) hide show
  1. checksums.yaml +13 -5
  2. data/.travis.yml +3 -0
  3. data/lib/synapse/config_generator/haproxy.rb +1 -1
  4. data/lib/synapse/version.rb +1 -1
  5. data/spec/lib/synapse/haproxy_spec.rb +42 -0
  6. metadata +33 -33
checksums.yaml CHANGED
@@ -1,7 +1,15 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: a4fc7fdaab530154bb53815482fdac2ea5d316b2
4
- data.tar.gz: 8c4d21c1492b5db666dab217b2e5170faa0638f4
2
+ !binary "U0hBMQ==":
3
+ metadata.gz: !binary |-
4
+ NWU1NjVhM2M0NDBhNmU1Mjg0NzllYzUwNGRmNThjODAxMGQyODFmMw==
5
+ data.tar.gz: !binary |-
6
+ MTVjZWRhYjM0YjJkNWVhY2Q2ZTY2NWU4NjBmZGI0YmNhZWNjNjI1OQ==
5
7
  SHA512:
6
- metadata.gz: 448734796df25671d0db0c8f693f2e4820c9ae590c85859790137968d5f63870a5489e7cfc765beb02641e3999a284f54676f336d20467058da586d0d1c51d91
7
- data.tar.gz: 991a90e100616daf2c5c7d941c642abea588a565266b126bbff01cb74dbd02e66e0e17907ab3ccdea8a044a3ac3ead937055b604446395ff8b6fbc6a9f840625
8
+ metadata.gz: !binary |-
9
+ YTkzMTAwNTBhNTE0NmUwMjg5YjQ4ZTNmNTA5ZTAxZDVlMzhlN2U0YmM5NmVi
10
+ M2QwMjliOGVjOGVhYzBkYjMwYzliM2Y0Y2Q4ZDJjMDM4ODRmOTJiYjA5OWRl
11
+ ODc0N2ZmNzg2ZWE4OWMxNTQ3M2M3ZGJlMTY5MmZkYmViN2ZiZWQ=
12
+ data.tar.gz: !binary |-
13
+ ZGIxNDA5ZDJjZWU2MjY0YjU4NmI2ODE0YjlkNmFlNmM4OTM4OTQyMWNhZDJl
14
+ ZDM5NGRmOWVmYTljMmE0YmU3MTc0NDE5NTZiMWFjYTI1ZjM2Y2NkYjJmZDFi
15
+ YmM0Njc1NDQ1ZmNkMzkwMDZkMWRlM2IzNzczZGZhODI2MDJkNjU=
data/.travis.yml CHANGED
@@ -7,3 +7,6 @@ rvm:
7
7
  - 2.1.10
8
8
  - 2.2.5
9
9
  - 2.3.1
10
+
11
+ before_install:
12
+ - gem install bundler
data/lib/synapse/config_generator/haproxy.rb CHANGED
@@ -1068,7 +1068,7 @@ class Synapse::ConfigGenerator
1068
1068
 
1069
1069
  # The ordering here is important. First we add all the backends in the
1070
1070
  # disabled state...
1071
- @state_cache.backends(watcher).each do |backend_name, backend|
1071
+ @state_cache.backends(watcher.name).each do |backend_name, backend|
1072
1072
  backends[backend_name] = backend.merge('enabled' => false)
1073
1073
  # We remember the haproxy_server_id from a previous reload here.
1074
1074
  # Note though that if live servers below define haproxy_server_id
data/lib/synapse/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Synapse
2
- VERSION = "0.15.0"
2
+ VERSION = "0.15.1"
3
3
  end
data/spec/lib/synapse/haproxy_spec.rb CHANGED
@@ -481,6 +481,48 @@ describe Synapse::ConfigGenerator::Haproxy do
481
481
  expect(subject.generate_backend_stanza(mockwatcher, mockConfig)).to eql(["\nbackend example_service", [], ["\tserver somehost:5555 somehost:5555 id 1 cookie somehost:5555 check inter 2000 rise 3 fall 2"]])
482
482
  end
483
483
 
484
+ describe 'when known backend gets offline' do
485
+ let(:mockStateCache) do
486
+ mockCache = double(Synapse::ConfigGenerator::Haproxy::HaproxyState)
487
+ allow(mockCache).to receive(:backends).with(mockwatcher.name).and_return(
488
+ {
489
+ "somehost2:5555" => {
490
+ "host" => "somehost2",
491
+ "port" => 5555,
492
+ 'haproxy_server_id' => 10,
493
+ }
494
+ }
495
+ )
496
+ mockCache
497
+ end
498
+
499
+ before do
500
+ allow(mockwatcher).to receive(:config_for_generator).and_return(
501
+ {
502
+ 'haproxy' => {
503
+ 'server_options' => "check inter 2000 rise 3 fall 2",
504
+ 'backend_order' => 'no_shuffle',
505
+ }
506
+ }
507
+ )
508
+ subject.instance_variable_set(:@state_cache, mockStateCache)
509
+ end
510
+
511
+ it 'generates backend stanza with the disabled stat' do
512
+ mockConfig = ['mode tcp']
513
+ expect(subject.generate_backend_stanza(mockwatcher, mockConfig)).to eql(
514
+ [
515
+ "\nbackend example_service",
516
+ ["\tmode tcp"],
517
+ [
518
+ "\tserver somehost2:5555 somehost2:5555 id 10 check inter 2000 rise 3 fall 2 disabled",
519
+ "\tserver somehost:5555 somehost:5555 id 1 check inter 2000 rise 3 fall 2"
520
+ ]
521
+ ]
522
+ )
523
+ end
524
+ end
525
+
484
526
  describe 'generate backend stanza in correct order' do
485
527
  let(:multiple_backends_stanza_map) do
486
528
  {
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: synapse
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.15.0
4
+ version: 0.15.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Martin Rhoads
@@ -10,174 +10,174 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2017-09-06 00:00:00.000000000 Z
13
+ date: 2017-09-15 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: aws-sdk
17
17
  requirement: !ruby/object:Gem::Requirement
18
18
  requirements:
19
- - - "~>"
19
+ - - ~>
20
20
  - !ruby/object:Gem::Version
21
21
  version: '1.39'
22
22
  type: :runtime
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
25
25
  requirements:
26
- - - "~>"
26
+ - - ~>
27
27
  - !ruby/object:Gem::Version
28
28
  version: '1.39'
29
29
  - !ruby/object:Gem::Dependency
30
30
  name: docker-api
31
31
  requirement: !ruby/object:Gem::Requirement
32
32
  requirements:
33
- - - "~>"
33
+ - - ~>
34
34
  - !ruby/object:Gem::Version
35
35
  version: '1.7'
36
36
  type: :runtime
37
37
  prerelease: false
38
38
  version_requirements: !ruby/object:Gem::Requirement
39
39
  requirements:
40
- - - "~>"
40
+ - - ~>
41
41
  - !ruby/object:Gem::Version
42
42
  version: '1.7'
43
43
  - !ruby/object:Gem::Dependency
44
44
  name: zk
45
45
  requirement: !ruby/object:Gem::Requirement
46
46
  requirements:
47
- - - "~>"
47
+ - - ~>
48
48
  - !ruby/object:Gem::Version
49
49
  version: 1.9.4
50
50
  type: :runtime
51
51
  prerelease: false
52
52
  version_requirements: !ruby/object:Gem::Requirement
53
53
  requirements:
54
- - - "~>"
54
+ - - ~>
55
55
  - !ruby/object:Gem::Version
56
56
  version: 1.9.4
57
57
  - !ruby/object:Gem::Dependency
58
58
  name: logging
59
59
  requirement: !ruby/object:Gem::Requirement
60
60
  requirements:
61
- - - "~>"
61
+ - - ~>
62
62
  - !ruby/object:Gem::Version
63
63
  version: '1.8'
64
64
  type: :runtime
65
65
  prerelease: false
66
66
  version_requirements: !ruby/object:Gem::Requirement
67
67
  requirements:
68
- - - "~>"
68
+ - - ~>
69
69
  - !ruby/object:Gem::Version
70
70
  version: '1.8'
71
71
  - !ruby/object:Gem::Dependency
72
72
  name: hashdiff
73
73
  requirement: !ruby/object:Gem::Requirement
74
74
  requirements:
75
- - - "~>"
75
+ - - ~>
76
76
  - !ruby/object:Gem::Version
77
77
  version: 0.2.3
78
78
  type: :runtime
79
79
  prerelease: false
80
80
  version_requirements: !ruby/object:Gem::Requirement
81
81
  requirements:
82
- - - "~>"
82
+ - - ~>
83
83
  - !ruby/object:Gem::Version
84
84
  version: 0.2.3
85
85
  - !ruby/object:Gem::Dependency
86
86
  name: rake
87
87
  requirement: !ruby/object:Gem::Requirement
88
88
  requirements:
89
- - - ">="
89
+ - - ! '>='
90
90
  - !ruby/object:Gem::Version
91
91
  version: '0'
92
92
  type: :development
93
93
  prerelease: false
94
94
  version_requirements: !ruby/object:Gem::Requirement
95
95
  requirements:
96
- - - ">="
96
+ - - ! '>='
97
97
  - !ruby/object:Gem::Version
98
98
  version: '0'
99
99
  - !ruby/object:Gem::Dependency
100
100
  name: rspec
101
101
  requirement: !ruby/object:Gem::Requirement
102
102
  requirements:
103
- - - "~>"
103
+ - - ~>
104
104
  - !ruby/object:Gem::Version
105
105
  version: 3.1.0
106
106
  type: :development
107
107
  prerelease: false
108
108
  version_requirements: !ruby/object:Gem::Requirement
109
109
  requirements:
110
- - - "~>"
110
+ - - ~>
111
111
  - !ruby/object:Gem::Version
112
112
  version: 3.1.0
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: factory_girl
115
115
  requirement: !ruby/object:Gem::Requirement
116
116
  requirements:
117
- - - ">="
117
+ - - ! '>='
118
118
  - !ruby/object:Gem::Version
119
119
  version: '0'
120
120
  type: :development
121
121
  prerelease: false
122
122
  version_requirements: !ruby/object:Gem::Requirement
123
123
  requirements:
124
- - - ">="
124
+ - - ! '>='
125
125
  - !ruby/object:Gem::Version
126
126
  version: '0'
127
127
  - !ruby/object:Gem::Dependency
128
128
  name: pry
129
129
  requirement: !ruby/object:Gem::Requirement
130
130
  requirements:
131
- - - ">="
131
+ - - ! '>='
132
132
  - !ruby/object:Gem::Version
133
133
  version: '0'
134
134
  type: :development
135
135
  prerelease: false
136
136
  version_requirements: !ruby/object:Gem::Requirement
137
137
  requirements:
138
- - - ">="
138
+ - - ! '>='
139
139
  - !ruby/object:Gem::Version
140
140
  version: '0'
141
141
  - !ruby/object:Gem::Dependency
142
142
  name: pry-nav
143
143
  requirement: !ruby/object:Gem::Requirement
144
144
  requirements:
145
- - - ">="
145
+ - - ! '>='
146
146
  - !ruby/object:Gem::Version
147
147
  version: '0'
148
148
  type: :development
149
149
  prerelease: false
150
150
  version_requirements: !ruby/object:Gem::Requirement
151
151
  requirements:
152
- - - ">="
152
+ - - ! '>='
153
153
  - !ruby/object:Gem::Version
154
154
  version: '0'
155
155
  - !ruby/object:Gem::Dependency
156
156
  name: webmock
157
157
  requirement: !ruby/object:Gem::Requirement
158
158
  requirements:
159
- - - ">="
159
+ - - ! '>='
160
160
  - !ruby/object:Gem::Version
161
161
  version: '0'
162
162
  type: :development
163
163
  prerelease: false
164
164
  version_requirements: !ruby/object:Gem::Requirement
165
165
  requirements:
166
- - - ">="
166
+ - - ! '>='
167
167
  - !ruby/object:Gem::Version
168
168
  version: '0'
169
169
  - !ruby/object:Gem::Dependency
170
170
  name: timecop
171
171
  requirement: !ruby/object:Gem::Requirement
172
172
  requirements:
173
- - - ">="
173
+ - - ! '>='
174
174
  - !ruby/object:Gem::Version
175
175
  version: '0'
176
176
  type: :development
177
177
  prerelease: false
178
178
  version_requirements: !ruby/object:Gem::Requirement
179
179
  requirements:
180
- - - ">="
180
+ - - ! '>='
181
181
  - !ruby/object:Gem::Version
182
182
  version: '0'
183
183
  description: Synapse is a daemon used to dynamically configure and manage local instances
@@ -193,10 +193,10 @@ executables:
193
193
  extensions: []
194
194
  extra_rdoc_files: []
195
195
  files:
196
- - ".gitignore"
197
- - ".mailmap"
198
- - ".rspec"
199
- - ".travis.yml"
196
+ - .gitignore
197
+ - .mailmap
198
+ - .rspec
199
+ - .travis.yml
200
200
  - Gemfile
201
201
  - Gemfile.lock
202
202
  - LICENSE.txt
@@ -249,17 +249,17 @@ require_paths:
249
249
  - lib
250
250
  required_ruby_version: !ruby/object:Gem::Requirement
251
251
  requirements:
252
- - - ">="
252
+ - - ! '>='
253
253
  - !ruby/object:Gem::Version
254
254
  version: '0'
255
255
  required_rubygems_version: !ruby/object:Gem::Requirement
256
256
  requirements:
257
- - - ">="
257
+ - - ! '>='
258
258
  - !ruby/object:Gem::Version
259
259
  version: '0'
260
260
  requirements: []
261
261
  rubyforge_project:
262
- rubygems_version: 2.4.5
262
+ rubygems_version: 2.5.1
263
263
  signing_key:
264
264
  specification_version: 4
265
265
  summary: Dynamic HAProxy configuration daemon