sappho-heatmiser-proxy 0.1.6 → 0.1.7

data/lib/sappho-heatmiser-proxy.rb

@@ -20,7 +20,7 @@ module Sappho
           Sappho::ApplicationAutoFlushLog.instance.info "#{NAME} version #{VERSION} - #{HOMEPAGE}"
           port = SystemConfiguration.instance.heatmiserPort
           maxClients = SystemConfiguration.instance.maxClients
-          server = Sappho::Socket::SafeServer.new('heatmiser proxy', port, maxClients, 8)
+          server = Sappho::Socket::SafeServer.new('heatmiser proxy', port, maxClients, 15, true)
           server.serve do
             | socket, ip | HeatmiserClient.new(socket, ip).communicate
           end

data/lib/sappho-heatmiser-proxy/command_queue.rb

@@ -16,11 +16,27 @@ module Sappho
         include Singleton, Sappho::LogUtilities
 
         def initialize
+          @refreshStatus = false
           @queue = []
           @mutex = Mutex.new
           @log = Sappho::ApplicationAutoFlushLog.instance
         end
 
+        def refreshStatus clientIP
+          @log.info "client #{clientIP} requests status refresh"
+          @mutex.synchronize do
+            @refreshStatus = true
+          end
+        end
+
+        def refreshStatus
+          @mutex.synchronize do
+            required = @refreshStatus
+            @refreshStatus = false
+            required
+          end
+        end
+
         def push clientIP, command
           @log.info "client #{clientIP} requests command: #{hexString command}"
           @mutex.synchronize do

data/lib/sappho-heatmiser-proxy/heatmiser.rb

@@ -48,8 +48,9 @@ module Sappho
                   log.info "clock correction: #{hexString command}"
                 end
               end
+              refreshRequested = queue.refreshStatus or yield
               unless command
-                command = queryCommand if (Time.now - timestamp) >= config.sampleDelay or yield
+                command = queryCommand if refreshRequested or (Time.now - timestamp) >= config.sampleDelay
               end
               if command
                 log.debug "sending command: #{hexString command}" if log.debug?

data/lib/sappho-heatmiser-proxy/heatmiser_client.rb

@@ -19,40 +19,42 @@ module Sappho
         def initialize client, ip
           @ip = ip
           @client = client
-          @status = HeatmiserStatus.instance
-          @log = Sappho::ApplicationAutoFlushLog.instance
         end
 
         def communicate
+          queue = CommandQueue.instance
+          queue.refreshStatus @ip
+          status = HeatmiserStatus.instance
           config = SystemConfiguration.instance
+          log = Sappho::ApplicationAutoFlushLog.instance
           active = true
           while active do
             begin
               command = read 5
               if command == 'check'
-                reply = @status.get { @status.valid ? 'ok' : 'error: last response from heatmiser unit was invalid' }
-                @log.info "client #{@ip} checking status - reply: #{reply}"
+                reply = status.get { status.valid ? 'ok' : 'error: last response from heatmiser unit was invalid' }
+                log.info "client #{@ip} checking status - reply: #{reply}"
                 @client.write "#{reply}\r\n"
                 active = false
               else
                 command = command.unpack('c*')
-                @log.debug "header: #{hexString command}" if @log.debug?
+                log.debug "header: #{hexString command}" if log.debug?
                 raise ClientDataError, "invalid pin" unless (command[3] & 0xFF) == config.pinLo and (command[4] & 0xFF) == config.pinHi
                 packetSize = (command[1] & 0xFF) | ((command[2] << 8) & 0xFF00)
                 raise ClientDataError, "invalid packet size" if packetSize < 7 or packetSize > 128
                 command += read(packetSize - 5).unpack('c*')
-                CommandQueue.instance.push @ip, command unless (command[0] & 0xFF) == 0x93
-                @status.get { @client.write @status.raw.pack('c*') if @status.valid }
-                @log.info "command received from client #{@ip} so it is alive"
+                queue.push @ip, command unless (command[0] & 0xFF) == 0x93
+                status.get { @client.write status.raw.pack('c*') if status.valid }
+                log.info "command received from client #{@ip} so it is alive"
               end
             rescue Timeout::Error
-              @log.info "timeout on client #{@ip} so presuming it dormant"
+              log.info "timeout on client #{@ip} so presuming it dormant"
               active = false
             rescue ClientDataError => error
-              @log.info "data error from client #{@ip}: #{error.message}"
+              log.info "data error from client #{@ip}: #{error.message}"
               active = false
             rescue => error
-              @log.error error
+              log.error error
               active = false
             end
           end

data/lib/sappho-heatmiser-proxy/version.rb

@@ -7,7 +7,7 @@ module Sappho
   module Heatmiser
     module Proxy
       NAME = 'sappho-heatmiser-proxy'
-      VERSION = '0.1.6'
+      VERSION = '0.1.7'
       AUTHORS = ['Andrew Heald']
       EMAILS = ['andrew@heald.co.uk']
       HOMEPAGE = 'https://github.com/sappho/sappho-heatmiser-proxy/wiki'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sappho-heatmiser-proxy
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Andrew Heald
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-20 00:00:00 Z
+date: 2012-04-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake