sappho-heatmiser-proxy 0.1.8 → 0.1.9

data/lib/sappho-heatmiser-proxy.rb

@@ -20,12 +20,14 @@ 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, 15, true)
+          server = Sappho::Socket::SafeServer.new('heatmiser proxy', port, maxClients, 10, true)
           server.serve do
             | socket, ip | HeatmiserClient.new(socket, ip).communicate
           end
           Thread.new do
-            Heatmiser.new.monitor { server.clientCount > 0 }
+            Heatmiser.new.monitor do
+              server.clientCount > 0
+            end
           end.join
         end
 

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

@@ -16,7 +16,7 @@ module Sappho
         include Singleton, Sappho::LogUtilities
 
         def initialize
-          @refreshStatus = false
+          @refreshRequested = false
           @queue = []
           @mutex = Mutex.new
           @log = Sappho::ApplicationAutoFlushLog.instance
@@ -25,14 +25,14 @@ module Sappho
         def refreshStatus clientIP
           @log.info "client #{clientIP} requests status refresh"
           @mutex.synchronize do
-            @refreshStatus = true
+            @refreshRequested = true
           end
         end
 
-        def refreshRequested
+        def refreshRequested?
           @mutex.synchronize do
-            requested = @refreshStatus
-            @refreshStatus = false
+            requested = @refreshRequested
+            @refreshRequested = false
             requested
           end
         end

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

@@ -48,20 +48,21 @@ module Sappho
                   log.info "clock correction: #{hexString command}"
                 end
               end
-              refreshRequested = queue.refreshRequested or yield
+              refreshRequested = queue.refreshRequested?
+              clientsActive = yield
               unless command
-                command = queryCommand if refreshRequested or (Time.now - timestamp) >= config.sampleDelay
+                command = queryCommand if refreshRequested or clientsActive or (Time.now - timestamp) >= config.sampleDelay
               end
               if command
                 log.debug "sending command: #{hexString command}" if log.debug?
                 socket.close #  just in case it wasn't last time around
                 socket.open config.heatmiserHostname, config.heatmiserPort
-                socket.settle 0.1
+                socket.settle 0.01
                 startTime = Time.now
                 socket.write command.pack('c*')
                 reply = socket.read(81).unpack('c*')
                 timestamp = Time.now
-                socket.settle 0.1
+                socket.settle 0.01
                 socket.close
                 log.debug "reply: #{hexString reply}" if log.debug?
                 crcHi = reply.pop & 0xFF

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

@@ -7,7 +7,7 @@ module Sappho
   module Heatmiser
     module Proxy
       NAME = 'sappho-heatmiser-proxy'
-      VERSION = '0.1.8'
+      VERSION = '0.1.9'
       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: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Andrew Heald