rubypitaya 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47e0970be5b8e403375046ab301bf90738610d336c94942e29512c54d9100d36
-  data.tar.gz: 3d5ca8e24fc63223516723a6db06f85a3f0228bde29a58f88187675bdf82e78c
+  metadata.gz: 3fe7572b5e800053db6b8d837220cd94b1fbe34c3d7b31b712bd009adc81cfa0
+  data.tar.gz: 5d9b2a19b1f7884982755de17477c74703da673a570c826dcf34dda450b58db1
 SHA512:
-  metadata.gz: 39246abfef21adb49e4434f7500d7577998e061a7f735ea3d394b3d7ffded21a6a95394146dbd29abd7dce45300ea1c3c8db7ebe9bf7b9657bef1b75a2b40b3c
-  data.tar.gz: b1de3be06e60907f611e2dce20161f02a1aaf5cf98a97b4c3330859cbb8d8266d572bde3c16f459612a0ecc8f6b4414dbc9918ddcea3c5e2562d30e4f4471e8e
+  metadata.gz: 4b840698bd22dcca93067960b568e836bf586d6cb1e25289ad16d432161380f85bd087728edfc4678f68daf41e73ca63ea7a51db4ee79169db60a68c7862aa1d
+  data.tar.gz: 0af3191c1ac731265e3e8f16d085bdcea0c144865cb2b4a2239a5a27a7f5adcd264679cc79045abfcbe40420a75086d592dd6f7b529d55ff7052c087b954bf58

data/lib/rubypitaya/app-template/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'rubypitaya', '1.3.1'
+gem 'rubypitaya', '1.4.0'
 
 group :development do
   gem 'pry', '0.12.2'

data/lib/rubypitaya/app-template/Gemfile.lock

@@ -62,7 +62,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.3)
-    rubypitaya (1.3.1)
+    rubypitaya (1.4.0)
       activerecord (= 6.0.2)
       etcdv3 (= 0.10.2)
       eventmachine (= 1.2.7)
@@ -85,7 +85,7 @@ DEPENDENCIES
   pry (= 0.12.2)
   rake (= 10.0)
   rspec (= 3.8.0)
-  rubypitaya (= 1.3.1)
+  rubypitaya (= 1.4.0)
 
 BUNDLED WITH
    1.17.2

data/lib/rubypitaya/app-template/docker-compose.yml

@@ -63,6 +63,7 @@ services:
       NATS_URL: 'nats://nats:4222'
       ETCD_URL: 'http://etcd:2379'
       ETCD_PREFIX: 'rubypitaya/'
+      ETCD_LEASE_SECONDS: '10'
       REDIS_URL: 'redis://redis:6379'
       DATABASE_HOST: 'db'
       DATABASE_USER: 'postgres'

data/lib/rubypitaya/core/etcd_connector.rb

@@ -6,35 +6,71 @@ module RubyPitaya
   class EtcdConnector
 
     def initialize(server_uuid, desktop_name, server_name, etcd_prefix,
-                  etcd_address, allow_reconnect)
+                   etcd_address, allow_reconnect, lease_seconds)
       @server_uuid = server_uuid
       @server_name = server_name
       @desktop_name = desktop_name
       @etcd_prefix = etcd_prefix
       @etcd_address = etcd_address
       @allow_reconnect = allow_reconnect
+      @lease_seconds = lease_seconds
+
+      @renew_connection_seconds = lease_seconds / 2.0
+
+      @renew_connection_key = nil
+      @renew_connection_value = nil
+      @renew_connection_thread = nil
     end
 
     def connect
+      connection_key = get_connection_key
+      connection_value = get_connection_value
+
       @connection = Etcdv3.new(endpoints: @etcd_address,
                               allow_reconnect: @allow_reconnect)
-      @connection.put(connection_key, connection_value)
+
+      @lease = @connection.lease_grant(@lease_seconds)
+
+      @connection.put(connection_key, connection_value, lease: @lease.ID)
+
+      @renew_connection_key = connection_key
+      @renew_connection_value = connection_value
+
+      renew_connection
     end
 
     def disconnect
-      @connection.del(connection_key)
+      @connection.del(get_connection_key)
     end
 
     private
 
-    def connection_key
+    def get_connection_key
       "#{@etcd_prefix}servers/#{@server_name}/#{@server_uuid}"
     end
 
-    def connection_value
+    def get_connection_value
       JSON.generate(get_server_data)
     end
 
+    def renew_connection
+      stop_renew_connection
+
+      @renew_connection_thread = Thread.new do
+        loop do
+          sleep(@renew_connection_seconds)
+
+          @lease = @connection.lease_grant(@lease_seconds)
+          @connection.put(@renew_connection_key, @renew_connection_value,
+                          lease: @lease.ID)
+        end
+      end
+    end
+
+    def stop_renew_connection
+      @renew_connection_thread.exit unless @renew_connection_thread.nil?
+    end
+
     def get_server_data
       {
         id: @server_uuid,

data/lib/rubypitaya/core/main.rb

@@ -38,10 +38,12 @@ module RubyPitaya
 
       @etcd_prefix = ENV['ETCD_PREFIX']
       @etcd_address = ENV['ETCD_URL']
+      @etcd_lease_seconds = ENV['ETCD_LEASE_SECONDS'].to_i
       @allow_reconnect = false
       @etcd_connector = EtcdConnector.new(@service_uuid, @desktop_name,
                                           @server_name, @etcd_prefix,
-                                          @etcd_address, @allow_reconnect)
+                                          @etcd_address, @allow_reconnect,
+                                          @etcd_lease_seconds)
       @etcd_connector.connect
 
       @nats_address = ENV['NATS_URL']

data/lib/rubypitaya/version.rb

@@ -1,4 +1,4 @@
 module RubyPitaya
-  VERSION = "1.3.1"
+  VERSION = "1.4.0"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypitaya
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Luciano Prestes Cavalcanti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-01 00:00:00.000000000 Z
+date: 2020-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg