apiotics 0.1.100 → 0.1.101

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62d44cf0a6a144746da74eef89c513853b76236f
-  data.tar.gz: 2fa86199cfe4fe7392cfc347e007d376846707db
+  metadata.gz: 58892b459a343aeede24a416eca1b11e663913ca
+  data.tar.gz: eab39b6fdd5d030ce9b8fb84d791ea54f592701d
 SHA512:
-  metadata.gz: 64faba1a078d9677239a0701c95eab30944de1aa7d1fc28981887c58ca431a4bd9ddee19d829fdbc65da56b6c5f29e9bf2afc4d7c13e63e35b902657bb71d4da
-  data.tar.gz: 33b4685c362dc35e1fd1ee921ce0871dd95e1bf4be721286c201e861f5c704406e28708e33554c54d70c2822101ccccb5b3209bef0ca665bff1081df42965484
+  metadata.gz: daf1d03fcd2f26e3c5f7f83c8b64b9ad1e346bb815147139191afa01f2669cd5095510035f04324e04f927c4982ed38a890b98a4245946bde128157a5e332545
+  data.tar.gz: a679ddece5bc3f8dae4d924098cb1aca6235677ad61c281197b3160a443d047ad6e3b9a6b54cd9d390fc52631ff6ee0500334ce3d5635f44b9fc6924a8676b42

data/lib/apiotics/server.rb

@@ -91,77 +91,66 @@ module Apiotics
     end
     
     def listen_remote
-      begin
-        Thread.new do
-          loop do
-        	  msg = @server.gets
-        	  puts msg
-            msg_hash = Apiotics::Parse.message(msg)
-            unless msg_hash["driver"] == "Core::Heartbeat"
-              r = Apiotics::Insert.new(msg_hash)
-              puts "Message received": msg_hash
-              if r.valid == true
-                if r.action == "set-request-ack" || r.action == "set-complete" || r.action == "get-ack"
-                  r.save
-                  unless Apiotics.configuration.local_logging == false
-                    r.save_log
-                  end
+      Thread.abort_on_exception = true
+      Thread.new do
+        loop do
+      	  msg = @server.gets
+      	  puts msg
+          msg_hash = Apiotics::Parse.message(msg)
+          unless msg_hash["driver"] == "Core::Heartbeat"
+            r = Apiotics::Insert.new(msg_hash)
+            puts "Message received": msg_hash
+            if r.valid == true
+              if r.action == "set-request-ack" || r.action == "set-complete" || r.action == "get-ack"
+                r.save
+                unless Apiotics.configuration.local_logging == false
+                  r.save_log
                 end
               end
-            else
-              monitor_heartbeat(msg_hash)
             end
+          else
+            monitor_heartbeat(msg_hash)
           end
-          ActiveRecord::Base.connection.close
         end
-      rescue => e
-        puts e
-        listen_remote
+        ActiveRecord::Base.connection.close
       end
-      
     end
     
     def listen_local
-      begin
-        if Apiotics.configuration.redis_comms_connection == false
-          server = TCPServer.open(@localport)
-          if Apiotics.configuration.handshake == true
-            self.send('{"action":"connect"}')
-          end
-          loop do
-          	Thread.fork(server.accept) do |client| 
-          		s = client.gets
-          		if @error_msg != nil
-          		  string = '{"error":"' + error_msg + '"}'
-          		  client.puts(string)
-          		end
-          		#puts s
-          		self.send(s)
-          	end
-          end
-        else
-          if Apiotics.configuration.handshake == true
-            self.send('{"action":"connect"}')
-          end
-          redis = ::Redis.new
-          redis.subscribe(Apiotics.configuration.public_key) do |on|
-            on.message do |channel, msg|
-              if @error_msg != nil
-          		  string = '{"error":"' + error_msg + '"}'
-          		  client.puts(string)
-          		end
-              #puts msg
-              self.send(msg)
-            end
+      if Apiotics.configuration.redis_comms_connection == false
+        server = TCPServer.open(@localport)
+        loop do
+          Thread.abort_on_exception = true
+        	Thread.fork(server.accept) do |client| 
+        		s = client.gets
+        		if @error_msg != nil
+        		  string = '{"error":"' + error_msg + '"}'
+        		  client.puts(string)
+        		end
+        		#puts s
+        		self.send(s)
+        	end
+        end
+      else
+        redis = ::Redis.new
+        redis.subscribe(Apiotics.configuration.public_key) do |on|
+          on.message do |channel, msg|
+            if @error_msg != nil
+        		  string = '{"error":"' + error_msg + '"}'
+        		  client.puts(string)
+        		end
+            #puts msg
+            self.send(msg)
           end
         end
-      rescue => e
-        puts e
-        listen_local
       end
     end
     
     def send_heartbeat(heartbeat)
+      if Apiotics.configuration.handshake == true
+        self.send('{"action":"connect"}')
+      end
+      Thread.abort_on_exception = true
       Thread.new do
         loop do
           heartbeat["interface"] = DateTime.now.to_i.to_s

data/lib/apiotics/version.rb

@@ -1,3 +1,3 @@
 module Apiotics
-  VERSION = '0.1.100'
+  VERSION = '0.1.101'
 end

metadata

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