saal 0.2.11 → 0.2.13

data/TODO

@@ -1,4 +1,5 @@
 TODO
+- Make the sensor storage in saal_daemon threaded so a single sensor read can't stall everything else for a long time
 !-Index the value column of the sensor reads for minimum and maximum
 - Change the filtering operations (e.g., outliercache) so that the raw value is always stored in the database
 - Make the outliercache filter based on the expected sensor range (e.g. -20-50 in temperature and 800-1200 in pressure) so as to not be overly sensitive when around 0)

data/bin/saal_chart

@@ -12,9 +12,7 @@ if ARGV.size != 1
   exit (2)
 end
 
-SENSORS = [[:temp_exterior, [-15, 45]], [:temp_estufa, [-15, 45]],
-           [:hum_exterior, [0,100]], 
-           [:pressao, [950,1050]]]
+SENSOR_RANGES = {:temperature=>[-15, 45], :humidity=>[0,100], :pressure=>[950,1050]}
 
 
 SAAL::Charts.new.each do |chart|
@@ -27,13 +25,14 @@ SAAL::Charts.new.each do |chart|
   @maxs = chart.maximum
   @avgs = chart.average
   @minmax = {}
-  SENSORS.each do |s,r| 
+  chart.sensors.each do |s|
+    s = s.name.to_sym
     @minmax[s] = {:maximum => @maxs[s], :minimum => @mins[s], :average => @avgs[s]}
   end
 
   File.open(ymlfile, 'w').write(YAML::dump(@minmax))
 
-  def normalize_data(data, min, max, offset=0)
+  def normalize_data(data, min, max)
     data.map do |i|
       if i.nil?
         -1.0
@@ -42,7 +41,7 @@ SAAL::Charts.new.each do |chart|
       elsif i > max
         100.0
       else
-        (((i-min)/(max-min).to_f)*1000).round/10.0+offset
+        (((i-min)/(max-min).to_f)*1000).round/10.0
       end
     end
   end
@@ -51,8 +50,8 @@ SAAL::Charts.new.each do |chart|
   @numperiods = @periodnames.size
   @averages = chart.average(NUM_VALUES)
 
-  @data = SENSORS.map do |sensor, range|
-    normalize_data(@averages[sensor], *range)
+  @data = chart.sensors.map do |sensor|
+    normalize_data(@averages[sensor.name.to_sym], *(SENSOR_RANGES[sensor.sensor_type]))
   end
 
   @dataurl = @data.map {|values| values.join(",")}.join('|')

data/lib/dinrelay.rb

@@ -28,11 +28,16 @@ module SAAL
     end
 
     class OutletGroup
+      DEFAULT_TIMEOUT = 2
+
+      attr_reader :timeout
+
       def initialize(opts={})
         @host = opts[:host] || opts['host'] || 'localhost'
         @port = opts[:port] || opts['port'] || 80
         @user = opts[:user] || opts['user'] || 'admin'
         @pass = opts[:pass] || opts['pass'] || '1234'
+        @timeout = opts[:timeout] || DEFAULT_TIMEOUT
       end
 
       def state(num)
@@ -48,17 +53,19 @@ module SAAL
       private
       def do_get(path)
         begin
-          Net::HTTP.start(@host,@port) do |http|
-            req = Net::HTTP::Get.new(path)
-            req.basic_auth @user, @pass
-            response = http.request(req)
-            if response.code != "200"
-              #$stderr.puts "ERROR: Code #{response.code}"
-              #$stderr.puts response.body
-              return nil
-            end
-            return response
+          http = Net::HTTP.new(@host,@port)
+          # Timeout faster when the other side doesn't respond
+          http.open_timeout = @timeout
+          http.read_timeout = @timeout
+          req = Net::HTTP::Get.new(path)
+          req.basic_auth @user, @pass
+          response = http.request(req)
+          if response.code != "200"
+            #$stderr.puts "ERROR: Code #{response.code}"
+            #$stderr.puts response.body
+            return nil
           end
+          return response
         rescue Exception
           return nil
         end

data/lib/saal.rb

@@ -10,7 +10,7 @@ module SAAL
     DBCONF = CONFDIR+"database.yml"
     CHARTSCONF = CONFDIR+"charts.yml"
 
-    VERSION = '0.2.11'
+    VERSION = '0.2.13'
 end
 
 require File.dirname(__FILE__)+'/dbstore.rb'

data/saal.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
 
   s.name              = 'saal'
-  s.version           = '0.2.11'
-  s.date              = '2011-05-26'
+  s.version           = '0.2.13'
+  s.date              = '2011-06-03'
 
   s.summary     = "Thin abstraction layer for interfacing and recording sensors (currently onewire) and actuators (currently dinrelay)"
   s.description = <<EOF

data/test/dinrelay_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__)+'/test_helper.rb'
 require 'webrick'
-#require 'webrick/accesslog'
+require 'benchmark'
 
 class TestDINRelay < Test::Unit::TestCase
   SERVICE_OPTS = {:host => 'localhost', :port => 33333, 
@@ -16,8 +16,10 @@ class TestDINRelay < Test::Unit::TestCase
       @pass = opts[:pass]
       @status = opts[:status] || 200
       @feedback = opts[:feedback] || {}
+      @sleep = opts[:sleep] || 0
     end
     def do_GET(req, res)
+      sleep @sleep
       @feedback[:uri] = req.request_uri.to_s
       WEBrick::HTTPAuth.basic_auth(req, res, "My Realm") {|user, pass|
         user == @user && pass == @pass
@@ -134,4 +136,36 @@ class TestDINRelay < Test::Unit::TestCase
       end
     end
   end
+
+  def test_fast_open_timeout
+    #FIXME: Find a way to make this test address more generic
+    @og=SAAL::DINRelay::OutletGroup.new(SERVICE_OPTS.merge(:host => "10.254.254.254", 
+                                                           :timeout=>0.1))
+    with_webrick(:html=>create_index_html(@vals)) do |feedback|
+      time = Benchmark.measure do
+        @vals.each do |num, state|
+          assert_equal nil, @og.state(num), "Read not timing out?"
+          assert !@og.set_state(num,"ON"), "State change not timing out?"
+        end
+      end
+      total_time = @og.timeout*2*@vals.keys.size
+      assert time.total < total_time
+             "Doing the reads took too long, are we really timing out?"
+    end
+  end
+
+  def test_fast_read_timeout
+    @og=SAAL::DINRelay::OutletGroup.new(SERVICE_OPTS.merge(:timeout=>0.1))
+    with_webrick(:html=>create_index_html(@vals),:sleep=>10) do |feedback|
+      time = Benchmark.measure do
+        @vals.each do |num, state|
+          assert_equal nil, @og.state(num), "Read not timing out?"
+          assert !@og.set_state(num,"ON"), "State change not timing out?"
+        end
+      end
+      total_time = @og.timeout*2*@vals.keys.size
+      assert time.total < total_time
+             "Doing the reads took too long, are we really timing out?"
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saal
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 2
-  - 11
-  version: 0.2.11
+  - 13
+  version: 0.2.13
 platform: ruby
 authors: 
 - "Pedro C\xC3\xB4rte-Real"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-26 00:00:00 -07:00
+date: 2011-06-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency