icinga2 0.6.3.1 → 0.6.4.0

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 (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/icinga2/network.rb +29 -26
  3. data/lib/icinga2/version.rb +2 -2
  4. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 10c0360bbd722598fce168aa8668253373d71727
4
- data.tar.gz: fbadc4b786f85b253dfb328c56271942828846da
3
+ metadata.gz: eacc8deb824f3977fc7aa502e7f355a13fa6b114
4
+ data.tar.gz: c5f56243487975571d581c13223a96e1c4ed2073
5
5
  SHA512:
6
- metadata.gz: 0ab8a732581ba8ab06da0cd3ce056f551ed7266229a97be27de41ecd4bd9d8aad88de73a5d0d4a08c55e0997de666a655cec9cc6b91d5038fd507cc1854a21db
7
- data.tar.gz: 9839fbb6c4bbb8f4af130106240e0cd4985561c2b1dfdc0e743c9957d55fc4b4e02ffdb7e677a24076b5c0fdf6b6d531257e56ce46bf8e986f13904285b8befd
6
+ metadata.gz: 24ea6e2ba8956c1050ca4498751141546dd7605ee11f8256d915029d95cf0896a70cc100828ee2d17ddb3c97b3e14c1b0957734b5ddd46ee2eb8479482156fba
7
+ data.tar.gz: f6f10f320fdbc0ba26c656859a33e95b61895ddbffca560e08d031392a58e21046ce8f42104a5725762a46c790995508886d9208ebc3c640c8aa853dab63e4a6
data/lib/icinga2/network.rb CHANGED
@@ -25,7 +25,7 @@ module Icinga2
25
25
  options = params.dig(:options)
26
26
  payload = params.dig(:payload) || {}
27
27
  result = {}
28
- max_retries = 3
28
+ max_retries = 30
29
29
  times_retried = 0
30
30
 
31
31
  return get_with_payload( params ) if payload.count >= 1
@@ -78,15 +78,16 @@ module Icinga2
78
78
  name: host,
79
79
  message: error['status']
80
80
  }
81
- rescue Errno::ECONNREFUSED => e
81
+ rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH => e
82
82
 
83
83
  if( times_retried < max_retries )
84
84
 
85
85
  times_retried += 1
86
- $stderr.puts( format( 'Cannot execute request to %s, cause: %s', url, e ) )
87
- $stderr.puts( format( ' retry %d%d', times_retried, max_retries ) )
86
+ $stderr.puts(format( 'Cannot execute request %s', url ))
87
+ $stderr.puts(format( ' cause: %s', e ))
88
+ $stderr.puts(format( ' retry %d / %d', times_retried, max_retries ))
88
89
 
89
- sleep( 2 )
90
+ sleep( 4 )
90
91
  retry
91
92
  else
92
93
  $stderr.puts( 'Exiting request ...' )
@@ -99,7 +100,6 @@ module Icinga2
99
100
  end
100
101
 
101
102
  result
102
-
103
103
  end
104
104
 
105
105
  # static function for GET Requests with payload
@@ -123,7 +123,7 @@ module Icinga2
123
123
  options = params.dig(:options)
124
124
  payload = params.dig(:payload) || {}
125
125
  result = {}
126
- max_retries = 3
126
+ max_retries = 30
127
127
  times_retried = 0
128
128
 
129
129
  headers['X-HTTP-Method-Override'] = 'GET'
@@ -150,7 +150,6 @@ module Icinga2
150
150
  unless( results.nil? )
151
151
 
152
152
  results.each do |r|
153
-
154
153
  node[r.dig('name')] = r
155
154
  end
156
155
 
@@ -170,15 +169,16 @@ module Icinga2
170
169
  name: host,
171
170
  message: error['status']
172
171
  }
173
- rescue Errno::ECONNREFUSED => e
172
+ rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH => e
174
173
 
175
174
  if( times_retried < max_retries )
176
175
 
177
176
  times_retried += 1
178
- $stderr.puts( format( 'Cannot execute request to %s, cause: %s', url, e ) )
179
- $stderr.puts( format( ' retry %d%d', times_retried, max_retries ) )
177
+ $stderr.puts(format( 'Cannot execute request %s', url ))
178
+ $stderr.puts(format( ' cause: %s', e ))
179
+ $stderr.puts(format( ' retry %d / %d', times_retried, max_retries ))
180
180
 
181
- sleep( 2 )
181
+ sleep( 4 )
182
182
  retry
183
183
  else
184
184
  $stderr.puts( 'Exiting request ...' )
@@ -211,7 +211,7 @@ module Icinga2
211
211
  headers = params.dig(:headers)
212
212
  options = params.dig(:options)
213
213
  payload = params.dig(:payload)
214
- max_retries = 3
214
+ max_retries = 30
215
215
  times_retried = 0
216
216
 
217
217
  headers['X-HTTP-Method-Override'] = 'POST'
@@ -267,15 +267,16 @@ module Icinga2
267
267
  }
268
268
  end
269
269
 
270
- rescue Errno::ECONNREFUSED => e
270
+ rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH => e
271
271
 
272
272
  if( times_retried < max_retries )
273
273
 
274
274
  times_retried += 1
275
- $stderr.puts( format( 'Cannot execute request to %s, cause: %s', url, e ) )
276
- $stderr.puts( format( ' retry %d%d', times_retried, max_retries ) )
275
+ $stderr.puts(format( 'Cannot execute request %s', url ))
276
+ $stderr.puts(format( ' cause: %s', e ))
277
+ $stderr.puts(format( ' retry %d / %d', times_retried, max_retries ))
277
278
 
278
- sleep( 2 )
279
+ sleep( 4 )
279
280
  retry
280
281
  else
281
282
  $stderr.puts( 'Exiting request ...' )
@@ -309,7 +310,7 @@ module Icinga2
309
310
  headers = params.dig(:headers)
310
311
  options = params.dig(:options)
311
312
  payload = params.dig(:payload)
312
- max_retries = 3
313
+ max_retries = 30
313
314
  times_retried = 0
314
315
 
315
316
  headers['X-HTTP-Method-Override'] = 'PUT'
@@ -380,15 +381,16 @@ module Icinga2
380
381
 
381
382
  end
382
383
 
383
- rescue Errno::ECONNREFUSED => e
384
+ rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH => e
384
385
 
385
386
  if( times_retried < max_retries )
386
387
 
387
388
  times_retried += 1
388
- $stderr.puts( format( 'Cannot execute request to %s, cause: %s', url, e ) )
389
- $stderr.puts( format( ' retry %d%d', times_retried, max_retries ) )
389
+ $stderr.puts(format( 'Cannot execute request %s', url ))
390
+ $stderr.puts(format( ' cause: %s', e ))
391
+ $stderr.puts(format( ' retry %d / %d', times_retried, max_retries ))
390
392
 
391
- sleep( 2 )
393
+ sleep( 4 )
392
394
  retry
393
395
  else
394
396
  $stderr.puts( 'Exiting request ...' )
@@ -474,15 +476,16 @@ module Icinga2
474
476
  }
475
477
 
476
478
  end
477
- rescue Errno::ECONNREFUSED => e
479
+ rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH => e
478
480
 
479
481
  if( times_retried < max_retries )
480
482
 
481
483
  times_retried += 1
482
- $stderr.puts( format( 'Cannot execute request to %s, cause: %s', url, e ) )
483
- $stderr.puts( format( ' retry %d%d', times_retried, max_retries ) )
484
+ $stderr.puts(format( 'Cannot execute request %s', url ))
485
+ $stderr.puts(format( ' cause: %s', e ))
486
+ $stderr.puts(format( ' retry %d / %d', times_retried, max_retries ))
484
487
 
485
- sleep( 2 )
488
+ sleep( 4 )
486
489
  retry
487
490
  else
488
491
  $stderr.puts( 'Exiting request ...' )
data/lib/icinga2/version.rb CHANGED
@@ -11,9 +11,9 @@ module Icinga2
11
11
  # minor part of version
12
12
  MINOR = 6
13
13
  # tiny part of version
14
- TINY = 3
14
+ TINY = 4
15
15
  # patch part
16
- PATCH = 1
16
+ PATCH = 0
17
17
 
18
18
  end
19
19
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: icinga2
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.3.1
4
+ version: 0.6.4.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Bodo Schulz