sappho-heatmiser-proxy 0.1.9 → 0.1.10

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

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

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

@@ -26,6 +26,7 @@ module Sappho
           desc = "heatmiser at #{config.heatmiserHostname}:#{config.heatmiserPort}"
           queryCommand = HeatmiserCRC.new([0x93, 0x0B, 0x00, config.pinLo, config.pinHi, 0x00, 0x00, 0xFF, 0xFF]).appendCRC
           socket = Sappho::Socket::SafeSocket.new 5
+          openPort = true
           timestamp = Time.now - config.sampleDelay
           loop do
             begin
@@ -48,22 +49,21 @@ module Sappho
                   log.info "clock correction: #{hexString command}"
                 end
               end
-              refreshRequested = queue.refreshRequested?
-              clientsActive = yield
               unless command
-                command = queryCommand if refreshRequested or clientsActive or (Time.now - timestamp) >= config.sampleDelay
+                command = queryCommand if yield 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.01
+                if openPort
+                  openPort = false
+                  socket.close
+                  socket.open config.heatmiserHostname, config.heatmiserPort
+                  socket.settle 1
+                end
                 startTime = Time.now
                 socket.write command.pack('c*')
                 reply = socket.read(81).unpack('c*')
                 timestamp = Time.now
-                socket.settle 0.01
-                socket.close
                 log.debug "reply: #{hexString reply}" if log.debug?
                 crcHi = reply.pop & 0xFF
                 crcLo = reply.pop & 0xFF
@@ -77,9 +77,11 @@ module Sappho
                 end
               end
             rescue Timeout::Error
+              openPort = true
               status.invalidate
               log.info "#{desc} is not responding - assuming connection down"
             rescue => error
+              openPort = true
               status.invalidate
               log.error error
             end

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

@@ -23,7 +23,6 @@ module Sappho
 
         def communicate
           queue = CommandQueue.instance
-          queue.refreshStatus @ip
           status = HeatmiserStatus.instance
           config = SystemConfiguration.instance
           log = Sappho::ApplicationAutoFlushLog.instance

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

@@ -7,7 +7,7 @@ module Sappho
   module Heatmiser
     module Proxy
       NAME = 'sappho-heatmiser-proxy'
-      VERSION = '0.1.9'
+      VERSION = '0.1.10'
       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: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 1
-  - 9
-  version: 0.1.9
+  - 10
+  version: 0.1.10
 platform: ruby
 authors: 
 - Andrew Heald
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-21 00:00:00 Z
+date: 2012-04-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake