naminori 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54e67a599ba4ae49fc096c3a3ef1d1e48d27d7d7
-  data.tar.gz: 401ad2a2850f44d7167a6b883f17ec82fe8bb9de
+  metadata.gz: 9613921c03bceebc050a914297919fe5f775d604
+  data.tar.gz: 35099756e8655cb6b4e5e701715588b000a67971
 SHA512:
-  metadata.gz: 66221651c57b6478359d8b942ed5ebeccacb7f914fafcef908cb05be58fd040abaa23e6d461fc9ce90143cbc046f009ee7ee28a591404e730df8e89f4fb6d82d
-  data.tar.gz: abc6cd82206a1bac19c8c6d957f9efee335136046709cb57356273ea9253af46048ca671dde3d4f18f220f30fa2f5eb4ead19ed6a46e14f33536be89ea34cddb
+  metadata.gz: 7d7591a77ea8bd35e685a8d500b4d0443a3cfa6b96869f9b116cbf3e26e55d70fb2e8c135a2cb578d6506768075cf5985c9cef3fc6410660b29df236509bcc39
+  data.tar.gz: c123f60e9b2424f6aac66ba3a5f4edb4dade94c93fd2816416a351020fa0e797541bcbf47662ff7c6f7346c8cc75266d6e0ee81cb6e078d99160bb663009bd3e

data/README.md

@@ -28,22 +28,22 @@ Or install it yourself as:
 require 'rubygems'
 require 'naminori'
 
-Naminori::Notifier::Configure.instance.set({
-  webhook_url: "https://hooks.slack.com/services/XXXXXX",
-  channel: "#pyama",
-  user:    "#naminori"
-})
+Naminoti::Notifier.configure do
+  webhook_url "https://hooks.slack.com/services/XXXXXX"
+  channel     "#pyama"
+end
 
 service_options = {
   vip:"192.168.77.9",
-  role: "dns"
+  role: "dns",
+  notifier: Naminori::Notifier.get_notifier("slack" ,notifier_options)
 }
 
 case
 when Naminori::Serf.role?("dns")
-  Naminori::Service.event("dns", "lvs", service_options)
+  Naminori::Service::Dns.event("lvs", service_options)
 when Naminori::Serf.role?("lb")
-  Naminori::Lb.health_check("dns", "lvs",service_options)
+  Naminori::Service::Dns.health_check("lvs", service_options)
 end
 
 ```
@@ -89,7 +89,7 @@ require 'naminori'
 
 service_options = { vip:"192.168.77.9", role: "dns" }
 
-Naminori::Lb.health_check("dns", "lvs", service_options)
+Naminori::Service::Dns.health_check("lvs", service_options)
 ```
 ```zsh
 # crontab -l
@@ -98,12 +98,9 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin
 * * * * * for i in `seq 0 10 59`;do (sleep ${i}; /opt/serf/event_handlers/health_check_example.rb)& done;
 ```
 
-
-
-
 ### Service Event Detail
 ```
-Naminori::Service.event(service_name, lb_name, options)
+Naminori::Service::Dns.event(lb_name, options)
 ```
 * service_name:
   dns or http
@@ -121,7 +118,8 @@ Naminori::Service.event(service_name, lb_name, options)
           method: "gateway",         # lvs_method gateway/ip/nat
           query: "pepabo.com",       # health_check_query
           retry: 3,                  # health_check_retry_count
-          timeout: 3                 # health_check_time_out
+          timeout: 3,                # health_check_time_out
+          notifier: nil              # notifier
         }
 ```
 ## Author

data/lib/naminori/lb.rb

@@ -2,30 +2,12 @@
 module Naminori
   class Lb
     class << self
-      def health_check(service_name, lb_name, options={})
-        service = Naminori::Service.get_service(service_name).new(options)
-        members = Naminori::Serf.get_alive_member_by_role(service.config.role)
-
-        members.each do |member|
-          ip = member_ip(member)
-          if service.healty?(ip)
-            get_lb(lb_name).add_member(ip, service)
-          elsif service.config.retry.times.all? { sleep 1; !service.healty?(ip) }
-            get_lb(lb_name).delete_member(ip, service)
-          end
-        end if members
-      end
-
       def get_lb(lb_name)
         case lb_name
         when "lvs"
           Naminori::Lb::Lvs
         end
       end
-
-      def member_ip(member)
-        member[:ip]
-      end
     end
   end
 end

data/lib/naminori/lb/base.rb

@@ -9,11 +9,11 @@ module Naminori
         def delete_member(rip, service)
           raise "Called abstract method: add_member"
         end
-
+        
         def notifier(type, options)
           message = "#{type} member ip:#{options[:rip]} protocol:#{options[:protocol]} in vip:#{options[:vip]}"
           puts message
-          Naminori::Notifier.notifier(type, message) if Naminori::Notifier::Configure.instance.enable?
+          Naminori::Notifier.notify(type, message)
         end
       end
     end

data/lib/naminori/notifier.rb

@@ -1,12 +1,11 @@
 #! /usr/bin/env ruby
 module Naminori
-  class Notifier
+  module Notifier
     class << self
-      def notifier(type, message)
-        config = Naminori::Notifier::Configure.instance
+      def notify(type, message)
         case
-        when config.webhook_url && config.user && config.channel
-          get_notifier("slack").notifier(type, message)
+        when Naminori::Notifier.config.slack_enable?
+          get_notifier("slack").notify(type, message)
         end
       end
 
@@ -16,6 +15,11 @@ module Naminori
           Naminori::Notifier::Slack.new
         end
       end
+
+      def configure(&block)
+        Naminori::Notifier.config(&block)
+      end
     end
   end
+  
 end

data/lib/naminori/notifier/base.rb

@@ -1,12 +1,7 @@
 #! /usr/bin/env ruby
 module Naminori
-  class Notifier
+  module Notifier
     class Base
-      attr_reader :config
-      def initialize()
-        @config = Naminori::Notifier::Configure.instance
-      end
-
       def notifier(type, message)
         raise "Called abstract method: add_server"
       end

data/lib/naminori/notifier/configure.rb

@@ -1,20 +1,38 @@
 #! /usr/bin/env ruby
-require 'singleton'
 module Naminori
-  class Notifier
+  module Notifier
     class Configure
-      include Singleton
-      attr_reader :webhook_url, :channel, :user
-
-      def set(options)
-        @webhook_url = options[:webhook_url]
-        @channel     = options[:channel]
-        @user        = options[:user]
+      def clear
+        instance_variables.each do |v|
+          instance_variable_set(v, nil)
+        end
       end
 
-      def enable?
+      def slack_enable?
         webhook_url && channel && user
       end
+
+      def webhook_url(url=nil)
+        @_webhook_url = url if url
+        @_webhook_url
+      end
+      
+      def channel(channel=nil)
+        @_channel = channel if channel 
+        @_channel
+      end
+
+      def user(user=nil)
+        @_user = user if user 
+        @_user
+      end
+    end
+
+    def self.config(&block)
+      @_config ||= Naminori::Notifier::Configure.new
+      @_config.instance_eval(&block) if block
+      @_config
     end
   end
+
 end

data/lib/naminori/notifier/slack.rb

@@ -1,11 +1,17 @@
 #! /usr/bin/env ruby
 module Naminori
-  class Notifier
+  module Notifier
     class Slack < Base
-      def notifier(type, message)
+      def notify(type, message)
         icon = type == "add" ? ":white_check_mark:" : ":no_entry_sign:"
-        notifier = ::Slack::Notifier.new(config.webhook_url, { channel: config.channel, username: config.user})
-        notifier.ping  icon + Time.new.strftime("%H:%M:%S ") + message, icon_emoji: ":sparkle:"
+        notifier = ::Slack::Notifier.new(
+          Naminori::Notifier.config.webhook_url,
+          {
+            channel: Naminori::Notifier.config.channel, 
+            username: Naminori::Notifier.config.user
+          }
+        )
+        notifier.ping  icon + message, icon_emoji: ":sparkle:"
       rescue => e
         p e
       end

data/lib/naminori/service/base.rb

@@ -16,14 +16,28 @@ module Naminori
         def event_ip
           Naminori::Serf.gets[:ip]
         end
+      
+        def health_check(lb_name, options)
+          service = self.new(options)
+          members = Naminori::Serf.get_alive_member_by_role(service.config.role)
+          members.each do |member|
+            ip = member[:ip]
+            if service.healty?(ip)
+              Naminori::Lb.get_lb(lb_name).add_member(ip, service)
+            elsif service.config.retry.times.all? { sleep 1; !service.healty?(ip) }
+              Naminori::Lb.get_lb(lb_name).delete_member(ip, service)
+            end
+          end if members
+        end
+        
       end
 
-      def initialize(options={})
+      def initialize(options)
         @config = Naminori::Service::Configure.new(
           default_config.merge(options)
         )
       end
-
+      
       def healty?(ip)
         raise "Called abstract method: healty?"
       end
@@ -31,6 +45,7 @@ module Naminori
       def default_config
         raise "Called abstract method: default_config"
       end
+
     end
   end
 end

data/lib/naminori/service/dns.rb

@@ -22,8 +22,7 @@ module Naminori
           method:    "nat",
           query:     "pepabo.com",
           retry:     3,
-          timeout:   3,
-          notifier:  nil
+          timeout:   3
         }
       end
     end

data/lib/naminori/service/http.rb

@@ -23,8 +23,7 @@ module Naminori
           method:     "nat",
           query:      "index.html",
           retry:      3,
-          timeout:    3,
-          notifier:   nil
+          timeout:    3
         }
       end
     end

data/lib/naminori/version.rb

@@ -1,3 +1,3 @@
 module Naminori
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: naminori
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - kazuhiko yamahsita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: LoadBarancer library on Serf.