sappho-heatmiser-proxy 0.1.4 → 0.1.5

data/lib/sappho-heatmiser-proxy.rb

@@ -20,11 +20,12 @@ module Sappho
           Sappho::ApplicationAutoFlushLog.instance.info "#{NAME} version #{VERSION} - #{HOMEPAGE}"
           port = SystemConfiguration.instance.heatmiserPort
           maxClients = SystemConfiguration.instance.maxClients
-          Sappho::Socket::SafeServer.new('heatmiser proxy', port, maxClients).serve do
+          server = Sappho::Socket::SafeServer.new('heatmiser proxy', port, maxClients)
+          server.serve do
             | socket, ip | HeatmiserClient.new(socket, ip).communicate
           end
           Thread.new do
-            Heatmiser.new.monitor
+            Heatmiser.new.monitor { server.clientCount > 0 }
           end.join
         end
 

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

@@ -49,7 +49,7 @@ module Sappho
                 end
               end
               unless command
-                command = queryCommand if (Time.now - timestamp) >= config.sampleDelay
+                command = queryCommand if (Time.now - timestamp) >= config.sampleDelay or yield
               end
               if command
                 log.debug "sending command: #{hexString command}" if log.debug?
@@ -81,7 +81,7 @@ module Sappho
               status.invalidate
               log.error error
             end
-            socket.settle 2
+            socket.settle 1
           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.4'
+      VERSION = '0.1.5'
       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: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Andrew Heald
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-29 00:00:00 Z
+date: 2012-04-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -42,12 +42,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 29
         segments: 
         - 0
         - 1
-        - 1
-        version: 0.1.1
+        - 3
+        version: 0.1.3
   type: :runtime
   version_requirements: *id002
 description: See the project home page for more information