port-authority 0.4.4 → 0.4.5

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MzMwNjE5MDJkNmFiYWNhZjM0NjM1NGM3ZDRlMmZhZWZkMzM5M2IwZg==
-  data.tar.gz: !binary |-
-    NTgwMjc3ZjRiM2ZiYTJjN2NmYjU4ZTY3MWEyMmE2MjRlYTVkZDA1OQ==
+SHA1:
+  metadata.gz: 455ef488cb12efccbe153b4a98c5f038220669b8
+  data.tar.gz: 2ccf7ce2db71a994c7cf34201c7ad9a8ebf073e4
 SHA512:
-  metadata.gz: !binary |-
-    ZWI1ODM4YjQ1MWI4MjYxZTY3Nzk5MTVmZGE4YjBhNWEwZmUzZTQ5YThmZDYx
-    ZTBlZTMwZDg4M2I4MGVhYzA1M2FhNDhkMGQ1NjBiZjBjNzViN2ViY2VhOGU4
-    NTljZjhhOTE0MDUzMmJkZjg1YmM3YmU4MTFiZGNiYTVlN2NkZDA=
-  data.tar.gz: !binary |-
-    MjZkNGZjOGFkMzFhZmYyZDUwMTczNjVjYmFhMGUyOTg2YzllYjg0MWI0NTdm
-    YTJlZGI2NmEzOGIzNmUzMGE0YjA5Y2FhNjk3MmE2ZDQ3MzM4MzUxMTdkMTU1
-    NjkzMGVlNDllZDRjY2Y5YmRiYTY1NmE3Y2JhMDczZWU2NGNjYTU=
+  metadata.gz: 06876467c2cc22d6278b0b533f1861e331da7e28220c767cbb37b65a2162c7ca2b5b961d35897f1d42846d00907bbb7a226a634146694a9745884584ef174749
+  data.tar.gz: 8821a5ec74e1881a816b44d94acc499fd025ea1f501db9395a475fbc3a8b8f52b989e8ffb0e02851bf81b32e84eaaf5d3d96ffe47ee443f040dab39f3a8dda9c

data/lib/port-authority/manager/init.rb

@@ -13,9 +13,9 @@ module PortAuthority
       include PortAuthority::Util::Helpers
 
       def initialize(proc_name = 'dummy')
+        @semaphore = { log: Mutex.new }
         @config = config
         @exit = false
-        @semaphore = { log: Mutex.new }
         Thread.current[:name] = 'main'
         syslog_init proc_name if @config[:syslog]
         setup proc_name
@@ -23,7 +23,13 @@ module PortAuthority
         debug 'setting signal handling'
         @exit_sigs = %w(INT TERM)
         @exit_sigs.each { |sig| Signal.trap(sig) { @exit = true } }
-        Signal.trap('USR2') { @config[:debug] = !@config[:debug] }
+        Signal.trap('USR2') do
+          if @config[:debug]
+            @config[:debug] = false
+          else
+            @config[:debug] = true
+          end
+        end
         Signal.trap('HUP')  { @config = config }
       end
 

data/lib/port-authority/manager/threads/swarm.rb

@@ -9,21 +9,13 @@ module PortAuthority
           begin
             etcd = etcd_connect!
             until @exit
-              debug 'checking ETCD state'
-              etcd_healthy? etcd
               debug 'checking swarm state'
               status = am_i_leader? etcd
               @semaphore[:swarm].synchronize { @status_swarm = status }
-              debug "i am #{status ? 'the leader' : 'not the leader' }"
+              debug "i am #{status ? '' : 'NOT' } the swarm leader"
               sleep @config[:etcd][:interval]
             end
             info 'ending swarm thread...'
-          rescue PortAuthority::Errors::ETCDIsSick => e
-            notice "#{e.class}: #{e.message}"
-            notice "connection: " + e.etcd.to_s
-            @semaphore[:swarm].synchronize { @status_swarm = false }
-            sleep @config[:etcd][:interval]
-            retry unless @exit
           rescue PortAuthority::Errors::ETCDConnectFailed => e
             err "#{e.class}: #{e.message}"
             err "connection: " + e.etcd.to_s

data/lib/port-authority/util/etcd.rb

@@ -24,8 +24,6 @@ module PortAuthority
 
       def am_i_leader?(etcd)
         Socket.ip_address_list.map(&:ip_address).member?(swarm_leader(etcd).split(':').first)
-      rescue StandardError => e
-        false
       end
 
     end

metadata

@@ -1,93 +1,93 @@
 --- !ruby/object:Gem::Specification
 name: port-authority
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Radek 'blufor' Slavicinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-25 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: etcd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: etcd-tools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: net-ping
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.8
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.25.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.25.0
 description: CLI Tools for PortAuthority
@@ -119,17 +119,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Port Authority