apiotics 0.1.82 → 0.1.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42c9d9b1e585d4e2c1f82632353bbb0bd6c739ef
-  data.tar.gz: aece1bb701a6d1aa433517b3b580619cd2df87f1
+  metadata.gz: 60cdc0f1790b8f4586b322d2662215b21de02abc
+  data.tar.gz: 4b9f828b1fec118b4f14b9173cea23cc7afa63b8
 SHA512:
-  metadata.gz: cdff2446906b94c0dd0d2fb71d4808e865df96c89f477321c7833945d27dca46eef2bf4eb0f666953ba62a0ded643b7fe4bf83c07b36eedae5848424ea7a8b8e
-  data.tar.gz: eef266027ba28c8a81edea98866d188a89765f017d8f9628511168a6eb9c57fe29579c12599b6be9706b5108fc37c68a99675b1389b0af4e7fc5a37e46309632
+  metadata.gz: 6fa9d5dd364846ab88578c2924ea817c54611106860cb3617b7ac3f2a4e2f91ee3b804a4ceb3f4dd455719b66c4bfb9b247bc8634a7418999c84e46fa9249f19
+  data.tar.gz: f2a499ec53ee6a37db9510f1913f1ec0a05813ffdf72ee0213a5cb2b27ef2f4e1d2e061de21582615932f6eca85c3d051a42335bd58c1440aeeda5a172ed7641

data/lib/apiotics/client.rb

@@ -14,9 +14,13 @@ module Apiotics
     end
 
     def send(msg)
-      connection = TCPSocket.open(@server, @port)
-      connection.puts( msg )
-      connection.close
+      if Apiotics.configuration.redis_comms_connection == false
+        connection = TCPSocket.open(@server, @port)
+        connection.puts( msg )
+        connection.close
+      else
+        $redis.publish Apiotics.configuration.public_key, msg
+      end
     end
     
   end

data/lib/apiotics/configuration.rb

@@ -1,7 +1,7 @@
 module Apiotics
   class Configuration
   
-    attr_accessor :public_key, :private_key, :local_logging, :targets, :local_port, :server, :server_port, :portal, :push, :tls, :verify_peer, :handshake, :parents, :reduced_metadata, :production_host, :interface_kinds
+    attr_accessor :public_key, :private_key, :local_logging, :targets, :local_port, :server, :server_port, :portal, :push, :tls, :verify_peer, :handshake, :parents, :reduced_metadata, :redis_comms_connection, :interface_kinds
   
     def initialize
       @public_key = nil
@@ -18,7 +18,7 @@ module Apiotics
       @handshake = true
       @parents = {}
       @reduced_metadata = false
-      @production_host = nil
+      @redis_comms_connection = false
       @interface_kinds = {
         "string" => "string",
         "text" => "string",

data/lib/apiotics/server.rb

@@ -108,20 +108,36 @@ module Apiotics
     
     def listen_local
       begin
-        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
+        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.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
         end
       rescue => e
         puts e

data/lib/apiotics/version.rb

@@ -1,3 +1,3 @@
 module Apiotics
-  VERSION = '0.1.82'
+  VERSION = '0.1.83'
 end

data/lib/generators/apiotics/initializer/templates/apiotics.rb.erb

@@ -9,5 +9,5 @@ Apiotics.configure do |config|
   config.handshake = true
   config.local_logging = false
   config.reduced_metadata = false
-  config.production_host = nil
+  config.redis_comms_connection = false
 end

data/lib/generators/apiotics/script/templates/server_control.rb

@@ -4,4 +4,4 @@
 
 require 'daemons'
 
-Daemons.run('lib/scripts/server.rb', ontop: true, no_pidfiles: true)
+Daemons.run('lib/scripts/server.rb', ontop: false)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apiotics
 version: !ruby/object:Gem::Version
-  version: 0.1.82
+  version: 0.1.83
 platform: ruby
 authors:
 - MicroArx Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2017-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails