sappho-heatmiser-proxy 0.0.8 → 0.0.9

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

@@ -19,15 +19,13 @@ module Sappho
         def initialize
           @mutex = Mutex.new
           @clients = {}
-          @max = Integer SystemConfiguration.instance.config['heatmiser.clients.max']
-          @log = TraceLog.instance
         end
 
         def register client
           @mutex.synchronize do
             ip = client.getpeername
             @clients[client] = ip = (4 ... 8).map{|pos|ip[pos]}.join('.')
-            @log.info "client #{ip} connected"
+            TraceLog.instance.info "client #{ip} connected"
             log
           end
         end
@@ -36,7 +34,7 @@ module Sappho
           @mutex.synchronize do
             ip = @clients[client]
             @clients.delete client
-            @log.info "client #{ip} disconnected"
+            TraceLog.instance.info "client #{ip} disconnected"
             log
           end
         end
@@ -46,13 +44,14 @@ module Sappho
         end
 
         def maxAlreadyConnected?
-          @mutex.synchronize { @clients.size >= @max }
+          @mutex.synchronize { @clients.size >= SystemConfiguration.instance.maxClients }
         end
 
         private
 
         def log
-          @log.info "clients: #{@clients.size > 0 ? (@clients.collect{|client, ip| ip}).join(', ') : 'none'}"
+          TraceLog.instance.info "clients: #{@clients.size > 0 ?
+              (@clients.collect{|client, ip| ip}).join(', ') : 'none'}"
         end
 
       end

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

@@ -22,69 +22,80 @@ module Sappho
           queue = CommandQueue.instance
           log = TraceLog.instance
           config = SystemConfiguration.instance
-          hostname = config.config['heatmiser.address']
+          desc = "heatmiser at #{config.heatmiserHostname}:#{config.heatmiserPort}"
           queryCommand = HeatmiserCRC.new([0x93, 0x0B, 0x00, config.pinLo, config.pinHi, 0x00, 0x00, 0xFF, 0xFF]).appendCRC
           loop do
-            status.invalidate
+            log.info "opening connection to #{desc}"
+            socket = nil
             begin
-              log.info "opening connection to heatmiser at #{hostname}:#{config.port}"
-              TCPSocket.open hostname, config.port do | socket |
-                log.info "connected to heatmiser at #{hostname}:#{config.port}"
-                loop do
-                  begin
-                    sleep 5
-                    command = queryCommand
-                    if queuedCommand = queue.get
-                      command = queuedCommand
-                    else
-                      if status.get{status.valid ? status.deviceTimeOffset : 0.0}.abs > 5.0
-                        timeNow = Time.now
-                        dayOfWeek = timeNow.wday
-                        dayOfWeek = 7 if dayOfWeek == 0
-                        command = HeatmiserCRC.new([0xA3, 0x12, 0x00, config.pinLo, config.pinHi, 0x01, 0x2B, 0x00, 0x07,
-                                                   timeNow.year - 2000,
-                                                   timeNow.month,
-                                                   timeNow.day,
-                                                   dayOfWeek,
-                                                   timeNow.hour,
-                                                   timeNow.min,
-                                                   timeNow.sec]).appendCRC
-                        log.info "clock correction: #{TraceLog.hex command}"
-                      end
-                    end
-                    log.debug "sending command: #{TraceLog.hex command}" if log.debug?
-                    reply = []
-                    startTime = Time.now
-                    timeout 20 do
-                      socket.write command.pack('c*')
-                      reply = socket.read(81).unpack('c*')
+              timeout 5 do
+                socket = TCPSocket.open config.heatmiserHostname, config.heatmiserPort
+              end
+              log.info "connected to #{desc}"
+            rescue Timeout::Error
+              log.info "timeout while connecting to #{desc}"
+            rescue => error
+              log.error error
+            end
+            if socket
+              active = true
+              while active do
+                begin
+                  sleep 5
+                  command = queryCommand
+                  if queuedCommand = queue.get
+                    command = queuedCommand
+                  else
+                    if status.get{status.valid ? status.deviceTimeOffset : 0.0}.abs > 5.0
+                      timeNow = Time.now
+                      dayOfWeek = timeNow.wday
+                      dayOfWeek = 7 if dayOfWeek == 0
+                      command = HeatmiserCRC.new([0xA3, 0x12, 0x00, config.pinLo, config.pinHi, 0x01, 0x2B, 0x00, 0x07,
+                                                 timeNow.year - 2000,
+                                                 timeNow.month,
+                                                 timeNow.day,
+                                                 dayOfWeek,
+                                                 timeNow.hour,
+                                                 timeNow.min,
+                                                 timeNow.sec]).appendCRC
+                      log.info "clock correction: #{TraceLog.hex command}"
                     end
-                    timestamp = Time.now
-                    log.debug "reply: #{TraceLog.hex reply}" if log.debug?
-                    crcHi = reply.pop & 0xFF
-                    crcLo = reply.pop & 0xFF
-                    crc = HeatmiserCRC.new reply
-                    if (reply[0] & 0xFF) == 0x94 and reply[1] == 0x51 and reply[2] == 0 and
-                        crc.crcHi == crcHi and crc.crcLo == crcLo
-                      reply << crcLo << crcHi
-                      status.set reply, timestamp, (timestamp - startTime) do
-                        queue.completed if queuedCommand
-                      end
+                  end
+                  log.debug "sending command: #{TraceLog.hex command}" if log.debug?
+                  reply = []
+                  startTime = Time.now
+                  timeout 20 do
+                    socket.write command.pack('c*')
+                    reply = socket.read(81).unpack('c*')
+                  end
+                  timestamp = Time.now
+                  log.debug "reply: #{TraceLog.hex reply}" if log.debug?
+                  crcHi = reply.pop & 0xFF
+                  crcLo = reply.pop & 0xFF
+                  crc = HeatmiserCRC.new reply
+                  if (reply[0] & 0xFF) == 0x94 and reply[1] == 0x51 and reply[2] == 0 and
+                      crc.crcHi == crcHi and crc.crcLo == crcLo
+                    reply << crcLo << crcHi
+                    status.set reply, timestamp, (timestamp - startTime) do
+                      queue.completed if queuedCommand
                     end
-                  rescue Timeout::Error
-                    log.info "heatmiser at #{hostname}:#{config.port} is not responding - assuming connection down"
-                    break
-                  rescue => error
-                    log.error error
-                    break
                   end
+                rescue Timeout::Error
+                  log.info "#{desc} is not responding - assuming connection down"
+                  active = false
+                rescue => error
+                  log.error error
+                  active = false
                 end
-                log.info "closing connection to heatmiser at #{hostname}:#{config.port}"
+              end
+              status.invalidate
+              begin
                 socket.close
+              rescue
               end
-            rescue => error
-              log.error error
+              log.info "closed connection to #{desc}"
             end
+            log.info "waiting 10 seconds before attempting to re-connect to #{desc}"
             sleep 10
           end
         end

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

@@ -14,14 +14,16 @@ module Sappho
 
         include Singleton
 
-        attr_reader :config, :port, :pinLo, :pinHi
+        attr_reader :heatmiserHostname, :heatmiserPort, :pinLo, :pinHi, :maxClients
 
         def initialize
-          @config = YAML.load_file(File.expand_path(ARGV[0] || 'heatmiser-proxy.yml'))
-          @port = Integer @config['heatmiser.port']
-          pin = Integer @config['heatmiser.pin']
+          data = YAML.load_file(File.expand_path(ARGV[0] || 'heatmiser-proxy.yml'))
+          @heatmiserHostname = data['heatmiser.address']
+          @heatmiserPort = Integer data['heatmiser.port']
+          pin = Integer data['heatmiser.pin']
           @pinLo = pin & 0xFF
           @pinHi = (pin >> 8) & 0xFF
+          @maxClients = Integer data['clients.max']
         end
 
       end

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

@@ -6,13 +6,13 @@
 module Sappho
   module Heatmiser
     module Proxy
-      NAME = "sappho-heatmiser-proxy"
-      VERSION = "0.0.8"
-      AUTHORS = ["Andrew Heald"]
-      EMAILS = ["andrew@heald.co.uk"]
-      HOMEPAGE = "https://github.com/sappho/sappho-heatmiser-proxy/wiki"
-      SUMMARY = "Acts as a proxy for Heatmiser hardware to allow continuous monitoring and control by many controllers"
-      DESCRIPTION = "See the project home page for more information"
+      NAME = 'sappho-heatmiser-proxy'
+      VERSION = '0.0.9'
+      AUTHORS = ['Andrew Heald']
+      EMAILS = ['andrew@heald.co.uk']
+      HOMEPAGE = 'https://github.com/sappho/sappho-heatmiser-proxy/wiki'
+      SUMMARY = 'Acts as a proxy for Heatmiser hardware to allow continuous monitoring and control by many controllers'
+      DESCRIPTION = 'See the project home page for more information'
     end
   end
 end

data/lib/sappho-heatmiser-proxy.rb

@@ -21,7 +21,7 @@ module Sappho
           TraceLog.instance.info "#{NAME} version #{VERSION} - #{HOMEPAGE}"
           Thread.new do
             clients = ClientRegister.instance
-            port = SystemConfiguration.instance.port
+            port = SystemConfiguration.instance.heatmiserPort
             log = TraceLog.instance
             log.info "opening proxy server port #{port}"
             TCPServer.open port do | server |

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sappho-heatmiser-proxy
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Andrew Heald
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-29 00:00:00 Z
+date: 2012-03-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -45,7 +45,6 @@ extra_rdoc_files: []
 
 files: 
 - bin/sappho-heatmiser-proxy
-- lib/sappho-heatmiser-proxy.rb
 - lib/sappho-heatmiser-proxy/client_register.rb
 - lib/sappho-heatmiser-proxy/command_queue.rb
 - lib/sappho-heatmiser-proxy/heatmiser.rb
@@ -55,6 +54,7 @@ files:
 - lib/sappho-heatmiser-proxy/system_configuration.rb
 - lib/sappho-heatmiser-proxy/trace_log.rb
 - lib/sappho-heatmiser-proxy/version.rb
+- lib/sappho-heatmiser-proxy.rb
 homepage: https://github.com/sappho/sappho-heatmiser-proxy/wiki
 licenses: []