port-authority 0.3.1 → 0.3.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGQyMDZkOGNmMTM1ZTEyYTI4ZDA5YWYxZDc2M2ZhYjY5NDIwZGJmOA==
+    Zjg2OGZmZTA1OWEwOTIzZGY5MDgwZmVhMWIxODEwNWE1NGVmOTgyMw==
   data.tar.gz: !binary |-
-    ZjMwNDUxNWY0MzllNTc2ZjZhNWEyZWQyYWNlYWY2NTQ4ZjhhM2NhOQ==
+    NDAwY2M3N2I1ZjBlM2MyZjM5M2U5MGRmNWI4MGQzZGM3MTc5OTc0NA==
 SHA512:
   metadata.gz: !binary |-
-    MDcxNWMxYTVhODE1MjMwM2U1ODk0OGUxOWQ0MDAyYWIzZTMwYTE4NGU3YWU4
-    OGViYzJmODc4NmM4NjMwZmM3MTVkYTg1YWQ4Y2Y4NDdiMTFmODc3NDE1NzRm
-    M2IzYWM2NDFhY2I1MTQzMjUwMmExNTFhMmRlMDhlOGY2Y2E3NWI=
+    NmE5NGY5NzFmOGZkMjRjZjViMDUxZWY2MGQxM2M2M2Q4ZWJjM2ZhNjc0OGYy
+    M2ZhYWQwNTg1NTE5ZjU0MjJhMDI0MTY5OThkYWUxZTA3NTQwNGViZjljYjgx
+    MDcwZGZlYzQ2M2I4MGZhNzE5YTYxM2Q3MzY4NGYyYjg3MjVlZTA=
   data.tar.gz: !binary |-
-    YjM3ZDEzOGNmZmM4MDU2ZGY2ZDc0NDc1ZjE1OWZlYTI3NzkxN2E2MGE3MGZj
-    NWI3MmQ4ZjBmNWRjMzBhYzQxZDc5Mjk0M2M3ZThhYWVkYjA3MjE0NGExYjE3
-    ZjI2ZjhhZGRhMjc3MTdkYzI2YWNmNzdjMTJkOGI5ODQ2ZWJkZDk=
+    ZDc3NzIzZGQxMGE3NWYxZDUwZTM2M2Q0MWU0YzY2NTI5ODJlMzExZmE2YWRm
+    MWI3MzZhZTI5MjEyMTRhZWM3YTJkZTYwMjIyNTAxOTNlZjM1NTNkNDQ1MDAz
+    YTAxZmE2NGY4ZTdjMTdhOWE1NzQ3NjQ2OTg3Yzg3YTY0YzA3ZWE=

data/bin/pa-manager

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require 'port-authority/manager/app'
+PortAuthority::Manager::App.new.run

data/lib/port-authority/{watchdog/master.rb → manager/app.rb}

@@ -2,18 +2,18 @@ require 'ipaddr'
 require 'port-authority/util/vip'
 require 'port-authority/util/etcd'
 require 'port-authority/util/loadbalancer'
-require 'port-authority/watchdog/init'
-require 'port-authority/watchdog/threads/icmp'
-require 'port-authority/watchdog/threads/swarm'
+require 'port-authority/manager/init'
+require 'port-authority/manager/threads/icmp'
+require 'port-authority/manager/threads/swarm'
 
 module PortAuthority
-  module Watchdog
-    class Manager < PortAuthority::Watchdog::Init
+  module Manager
+    class App < PortAuthority::Manager::Init
 
       include PortAuthority::Util::Etcd
       include PortAuthority::Util::Vip
       include PortAuthority::Util::LoadBalancer
-      include PortAuthority::Watchdog::Threads
+      include PortAuthority::Manager::Threads
 
       def run
         # exit if not root
@@ -23,7 +23,7 @@ module PortAuthority
         end
 
         # set process name and nice level (default: -20)
-        setup 'pa-master-watchdog'
+        setup 'pa-manager'
 
         # prepare semaphores
         @semaphore = {
@@ -35,7 +35,7 @@ module PortAuthority
         # prepare threads
         @thread = {
           icmp: thread_icmp,
-          etcd: thread_swarm,
+          swarm: thread_swarm
         }
 
         # prepare status vars
@@ -45,13 +45,19 @@ module PortAuthority
         # start threads
         @thread.each_value(&:run)
 
+        # setup docker client
+        lb_docker_setup! || @exit = true
+
+        # prepare container with load-balancer
+        lb_create || @exit = true
+
         # wait for threads to make sure they gather something
         debug 'waiting for threads to gather something...'
         sleep @config[:vip][:interval]
         first_cycle = true
 
         # main loop
-        while !@exit do
+        until @exit
           # initialize local state vars on first iteration
           status_swarm = status_icmp = false if first_cycle
 
@@ -107,14 +113,14 @@ module PortAuthority
             end
           end
 
+          next unless first_cycle
+
           # short report on first cycle
-          if first_cycle
-            info "i #{status_swarm ? 'AM' : 'am NOT'} the leader"
-            info "i #{got_vip? ? 'DO' : 'do NOT'} have the VIP"
-            info "i #{status_icmp ? 'CAN' : 'CANNOT'} see the VIP"
-            info "i #{status_haproxy ? 'CAN' : 'CANNOT'} see the VIP"
-            first_cycle = false
-          end
+          info "i #{status_swarm ? 'AM' : 'am NOT'} the leader"
+          info "i #{got_vip? ? 'DO' : 'do NOT'} have the VIP"
+          info "i #{status_icmp ? 'CAN' : 'CANNOT'} see the VIP"
+          info "i #{status_haproxy ? 'CAN' : 'CANNOT'} see the VIP"
+          first_cycle = false
         end
 
         # this is triggerred on exit

data/lib/port-authority/{watchdog → manager}/init.rb

@@ -6,7 +6,7 @@ require 'port-authority/util/logger'
 require 'port-authority/util/helpers'
 
 module PortAuthority
-  module Watchdog
+  module Manager
     class Init
 
       include PortAuthority::Util::Config

data/lib/port-authority/{watchdog → manager}/threads/icmp.rb

@@ -1,13 +1,13 @@
 require 'net/ping'
 
 module PortAuthority
-  module Watchdog
+  module Manager
     module Threads
       def thread_icmp
         Thread.new do
           debug 'starting ICMP thread...'
           icmp = Net::Ping::ICMP.new(@config[:vip][:ip])
-          while !@exit do
+          until @exit
             debug 'checking state by ICMP echo'
             status = vip_alive? icmp
             @semaphore[:icmp].synchronize { @status_icmp = status }

data/lib/port-authority/{watchdog → manager}/threads/swarm.rb

@@ -1,18 +1,18 @@
 module PortAuthority
-  module Watchdog
+  module Manager
     module Threads
       def thread_swarm
         Thread.new do
-          debug '<swarm> starting thread...'
+          debug 'starting swarm thread...'
           etcd = etcd_connect!
-          while !@exit do
-            debug '<swarm> checking etcd state'
+          until @exit
+            debug 'checking swarm state'
             status = am_i_leader? etcd
             @semaphore[:swarm].synchronize { @status_swarm = status }
-            debug "<swarm> i am #{status ? 'the leader' : 'not the leader' }"
+            debug "i am #{status ? 'the leader' : 'not the leader' }"
             sleep @config[:etcd][:interval]
           end
-          info '<swarm> ending thread...'
+          info 'ending swarm thread...'
         end
       end
     end

data/lib/port-authority.rb

@@ -1,5 +1,5 @@
 module PortAuthority
-  module Watchdog
+  module Manager
   end
 
   module Util

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: port-authority
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Radek 'blufor' Slavicinsky
@@ -93,22 +93,22 @@ dependencies:
 description: Tools for PortAuthority
 email: radek.slavicinsky@gmail.com
 executables:
-- pa-master-watchdog
+- pa-manager
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/pa-master-watchdog
+- bin/pa-manager
 - lib/port-authority.rb
+- lib/port-authority/manager/app.rb
+- lib/port-authority/manager/init.rb
+- lib/port-authority/manager/threads/icmp.rb
+- lib/port-authority/manager/threads/swarm.rb
 - lib/port-authority/util/config.rb
 - lib/port-authority/util/etcd.rb
 - lib/port-authority/util/helpers.rb
 - lib/port-authority/util/loadbalancer.rb
 - lib/port-authority/util/logger.rb
 - lib/port-authority/util/vip.rb
-- lib/port-authority/watchdog/init.rb
-- lib/port-authority/watchdog/master.rb
-- lib/port-authority/watchdog/threads/icmp.rb
-- lib/port-authority/watchdog/threads/swarm.rb
 homepage: https://github.com/blufor/etcd-tools
 licenses:
 - GPLv2

data/bin/pa-master-watchdog

@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require 'port-authority/watchdog/master'
-PortAuthority::Watchdog::Master.new.run