apiotics 0.1.106 → 0.1.107

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ae938082fb0065695bbf435576a499d1494dee8
-  data.tar.gz: 04de7d37aa5eea4cc7683954374e2b5ff5e55ccc
+  metadata.gz: 606275f78d00c05a5b3e8bfb9c34fa9d81b398d2
+  data.tar.gz: c4b3f245703a2302c564e5b933688b8ab0dd90f6
 SHA512:
-  metadata.gz: 440ec47c651b6f04257fca8dd1ed99e57e917122f4d14c762d9fabaf02789d3d043a4c3f234848a6df146777d94f07d3e811624793a600b04e4bea98f04ffb02
-  data.tar.gz: 86780ef017196c4b1ccdba57f3060c67024d2bf413dfd6434574c02bf5494a19d70591d4a5b6b4de0cf9ec5b1b2bd476101d932ae03bdf9bd6333dc1ea73310c
+  metadata.gz: 6fcc519a262b242561bb0c6e3359e498d633e604f1115bbe48cca49949b6361eac1dad8b569201cb0a7813c1ea852d51d910dd5394d14809ffbe8c4b7bce4e04
+  data.tar.gz: 2ceff891f833d0adf9742b0ac6446033acc8091b1ec1884d4845c49185b3fc635dc145a5c34d8b9b0058b88062482566742a6963c0b03f4fc06e6679aacee8ed

data/lib/apiotics/server.rb

@@ -10,85 +10,82 @@ require "redis"
 module Apiotics
   class Server
     def initialize
-      Thread.abort_on_exception = true
-      hive_public_key = ApioticsSetting.find_by(key: "hive_public_key")
-      if hive_public_key == nil || hive_public_key.value != Apiotics.configuration.public_key
-        Server.clear_db_settings
-      end
-      @error_msg = nil
-      server_details = Server.lookup
-      rgs = ApioticsSetting.find_by(key: "server")
-      rgs_port = ApioticsSetting.find_by(key: "port")
-      if rgs == nil
-        if server_details["status"] == "ok"
-          rgs = server_details["ip"]
-          c = ApioticsSetting.new
-          c.key = "server"
-          c.value = rgs
-          c.save
-          rgs_port = server_details["port"]
-          c = ApioticsSetting.new
-          c.key = "port"
-          c.value = rgs_port
-          c.save
-        else
-          @error_msg = server_details["status_msg"]
+      begin
+        Thread.abort_on_exception = true
+        hive_public_key = ApioticsSetting.find_by(key: "hive_public_key")
+        if hive_public_key == nil || hive_public_key.value != Apiotics.configuration.public_key
+          Server.clear_db_settings
         end
-      else
-        if server_details["status"] == "ok"
-          rgs.value = server_details["ip"]
-          rgs.save
-          rgs = rgs.value
-          rgs_port.value = server_details["port"]
-          rgs_port.save
-          rgs_port = rgs_port.value
+        @error_msg = nil
+        server_details = Server.lookup
+        rgs = ApioticsSetting.find_by(key: "server")
+        rgs_port = ApioticsSetting.find_by(key: "port")
+        if rgs == nil
+          if server_details["status"] == "ok"
+            rgs = server_details["ip"]
+            c = ApioticsSetting.new
+            c.key = "server"
+            c.value = rgs
+            c.save
+            rgs_port = server_details["port"]
+            c = ApioticsSetting.new
+            c.key = "port"
+            c.value = rgs_port
+            c.save
+          else
+            @error_msg = server_details["status_msg"]
+          end
         else
-          @error_msg = server_details["status_msg"]
-        end
-      end
-      if Apiotics.configuration.tls == true
-        socket = TCPSocket.new(rgs, rgs_port)
-        context = OpenSSL::SSL::SSLContext.new
-        context.key = Server.key
-        context.cert = Server.cert
-        if Apiotics.configuration.verify_peer == true
-          ca_tempfile = Tempfile.new
-          ca_tempfile.write Server.ca_cert.to_pem
-          ca_tempfile.rewind
-          context.ca_file = ca_tempfile.path
-          context.verify_mode = OpenSSL::SSL::VERIFY_PEER
+          if server_details["status"] == "ok"
+            rgs.value = server_details["ip"]
+            rgs.save
+            rgs = rgs.value
+            rgs_port.value = server_details["port"]
+            rgs_port.save
+            rgs_port = rgs_port.value
+          else
+            @error_msg = server_details["status_msg"]
+          end
         end
-        server = OpenSSL::SSL::SSLSocket.new socket, context
-        server.sync_close = true
-        begin
+        if Apiotics.configuration.tls == true
+          socket = TCPSocket.new(rgs, rgs_port)
+          context = OpenSSL::SSL::SSLContext.new
+          context.key = Server.key
+          context.cert = Server.cert
+          if Apiotics.configuration.verify_peer == true
+            ca_tempfile = Tempfile.new
+            ca_tempfile.write Server.ca_cert.to_pem
+            ca_tempfile.rewind
+            context.ca_file = ca_tempfile.path
+            context.verify_mode = OpenSSL::SSL::VERIFY_PEER
+          end
+          server = OpenSSL::SSL::SSLSocket.new socket, context
+          server.sync_close = true
           server.connect
-        rescue => e
-          server.close
-          raise e
-        end
-        if Apiotics.configuration.verify_peer == true
-          ca_tempfile.close(true)
-        end
-      else
-        begin
+          if Apiotics.configuration.verify_peer == true
+            ca_tempfile.close(true)
+          end
+        else
           server = TCPSocket.open(rgs, rgs_port)
-        rescue => e
+        end
+        @server = server
+        @localport = Apiotics.configuration.local_port
+        listen_remote
+        @heartbeat_state = Hash.new
+        heartbeat = {
+          "action" => "set-request",
+          "instance" => "0000000000000000000000000000000000000000000000000000000000000000",
+          "driver" => "Core::Heartbeat",
+          "interface" => nil
+        }
+        send_heartbeat(heartbeat)
+        listen_local
+      rescue => e
+        if server != nil
           server.close
-          raise e
         end
+        raise e
       end
-      @server = server
-      @localport = Apiotics.configuration.local_port
-      listen_remote
-      @heartbeat_state = Hash.new
-      heartbeat = {
-        "action" => "set-request",
-        "instance" => "0000000000000000000000000000000000000000000000000000000000000000",
-        "driver" => "Core::Heartbeat",
-        "interface" => nil
-      }
-      send_heartbeat(heartbeat)
-      listen_local
     end
 
     def send(msg)

data/lib/apiotics/version.rb

@@ -1,3 +1,3 @@
 module Apiotics
-  VERSION = '0.1.106'
+  VERSION = '0.1.107'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apiotics
 version: !ruby/object:Gem::Version
-  version: 0.1.106
+  version: 0.1.107
 platform: ruby
 authors:
 - MicroArx Corporation