teamd-discover 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82fba18d3cb946fe4de42b630f7e8660a1a08c7b
-  data.tar.gz: e3cedb935bfdab0f4961818a776e00d466c13f14
+  metadata.gz: c06635e4f5ca0c56cd1467cafd4c262de1776918
+  data.tar.gz: 8d66e2d83f34f57f43ef6e7bc10393e4eb48bd6d
 SHA512:
-  metadata.gz: 0daf8d401d4d88790b94662f3f8116c23c88ac1a115ac77f29bb3db3230d3e3ed6d8900c9ad05f418ebec0e7544e376d44588bb373c54aa774a72452564b84d1
-  data.tar.gz: eb6dbf912dc17469fa530bc136e69da273115936a5ef5bbfc153722f81add07866a679484b14e062a8212f90c46965b415aa07a9eb48700fee61c77fc546b229
+  metadata.gz: 269219ef0493dde5ee5eeb39cd6d908ede5a8c13b6cfd35fdbdee75b818c972650cb3f25db584cc3c9c6573907ff4455b707116f7d51e174bc7f7e59747bb0e7
+  data.tar.gz: 675229be6ff062034698bc285382584473505036f688a6cebb1bc87cf7cabb3a35b67910c59616b7f6dcbe417de56c8ac5009ff82b25a94ee48350141d274463

data/lib/queue_with_timeout.rb

@@ -0,0 +1,29 @@
+class QueueWithTimeout
+  def initialize
+    @mutex = Mutex.new
+    @queue = []
+    @recieved = ConditionVariable.new
+  end
+ 
+  def push(x)
+    @mutex.synchronize do
+      @queue.push x
+      @recieved.signal
+    end
+  end
+ 
+  def pop(non_block = false)
+    pop_with_timeout(non_block ? 0 : nil)
+  end
+ 
+  def pop_with_timeout(timeout = nil)
+    @mutex.synchronize do
+      if @queue.empty?
+        @recieved.wait(@mutex, timeout) if timeout != 0
+        #if we're still empty after the timeout, raise exception
+        raise ThreadError, "queue empty" if @queue.empty?
+      end
+      @queue.shift
+    end
+  end
+end

data/lib/teamd/discover/cli.rb

@@ -18,9 +18,12 @@ module Teamd
       end
       desc "discover","One shot discovery"
       def discover
-        token = Cli.peer.discover
-        url   = "ETCD_DISCOVERY=https://discovery.etcd.io/#{token}"
-        puts url
+        if token = Cli.peer.discover
+          url   = "ETCD_DISCOVERY=https://discovery.etcd.io/#{token}"
+          puts url
+        else
+          exit(1)
+        end
       end
     end
   end

data/lib/teamd/discover/peer.rb

@@ -1,13 +1,18 @@
 require "socket"
 require "securerandom"
+require "queue_with_timeout"
 
 module Teamd
   module Discover
     class Peer
+      class Timeout < Exception; end
       class << self
         def tid
           @tid ||= SecureRandom.hex(8)
         end
+        def domain
+          Socket.gethostname.split(".",2).last
+        end
       end
       def initialize
         @transport ||= Teamd::Discover::Transport.new
@@ -21,9 +26,8 @@ module Teamd
           process_announcement(message) if message.is_a? Message::ClusterAnnouncement
         end
       end
-      def discover timeout=15
-        input = Queue.new
-        wait timeout
+      def discover timeout=3
+        input   = QueueWithTimeout.new
         Thread.new do
           begin
             message = @transport.receive
@@ -36,24 +40,25 @@ module Teamd
             retry
           end
         end
-        # i,o=IO.pipe
         Thread.new do
           loop do
             @transport.transmit Message.build("discovery" => true)
             sleep 1
           end
         end
-        input.pop
+        begin
+          input.pop_with_timeout timeout
+        rescue ThreadError
+          nil
+        end
       end
-      def announce
-        @transport.transmit @registry.pack
+      def announce token=nil
+        @registry.add(Cluster.new(token: token,name:Peer.domain)) if token
+        @transport.transmit Message::ClusterAnnouncement.new clusters: @registry.pack
       end
       private
       def keep_alive
-        Thread.new{i,_=IO.pipe;IO.select([i])}
-      end
-      def wait timeout
-        Thread.new{sleep(timeout); exit(1);}
+        Thread.new{IO.select([IO.pipe[0]])}
       end
       def process_discovery message
         packet = Message::ClusterAnnouncement.new clusters: @registry.pack

data/lib/teamd/discover/registry.rb

@@ -31,7 +31,7 @@ module Teamd
       def add_cluster_from_environment
         uri    = URI ENV['ETCD_DISCOVERY'] rescue nil
         token  = uri.path.split("/").last  rescue nil
-        domain = Socket.gethostname.split(".",2).last rescue ""
+        domain = Peer.domain rescue ""
         add Cluster.new(name: domain, token: token) if token && domain
       end
       def add_clusters_from_files pattern

data/lib/teamd/discover/version.rb

@@ -1,5 +1,5 @@
 module Teamd
   module Discover
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/lib/teamd/discover.rb

@@ -6,3 +6,16 @@ require "teamd/discover/peer"
 require "teamd/discover/protocol"
 require "teamd/discover/registry"
 require "teamd/discover/transport"
+
+module Teamd
+  module Discover
+    class << self
+      def discover timeout=15
+        Teamd::Discover::Peer.new.discover timeout
+      end
+      def announce token
+        Teamd::Discover::Peer.new.announce token
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teamd-discover
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Mathias Kaufmann
@@ -126,6 +126,7 @@ files:
 - bin/console
 - bin/setup
 - exe/teamd-discover
+- lib/queue_with_timeout.rb
 - lib/teamd/discover.rb
 - lib/teamd/discover/cli.rb
 - lib/teamd/discover/cluster.rb