ardtweeno 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63968507920512729a01dd5e5952ce70b427bf99
-  data.tar.gz: 00a74be7f57bded6c488096b3c49bc3b4ee8eb82
+  metadata.gz: 3abb91d978d43c56436afbc005878c6cb591018a
+  data.tar.gz: cbb7970eebe1b05f14343ae2f0440415797a9451
 SHA512:
-  metadata.gz: b781f4581fb7f475cfbb219f53ae547a8e618115c6e01bf922396d34143fdbfbc7955e9f3a0f6c3a9af42df5dc5e55f4eecb6855a854a7639ce24a474cc6a6d9
-  data.tar.gz: 54ecc4d3c96a512f42d04c89e92a594b87f8b337ca089781b9fe7390972d151080cb26187b1853c54f8f3a35776b1bcc61c949099026b17bfa307387cd0444ec
+  metadata.gz: 3b31b31ff928b0a7583291bbffdee3807206e39d04b84598d71a5e297fb187e705c9322a343cf3ea35ed9c30f85e5fb627f6c846d1c2d6cbe2d94867454253cf
+  data.tar.gz: 3cddee84a5acd4cf36fdd9cf879b16fd5e4e6119389c3d815a1dc19ce32ffc7d39d3ebca65fae7d75c083ef6689581b2dabb6e8a88e622911bda7a9fbcb3e036

data/CHANGELOG

@@ -1,3 +1,40 @@
+## Version 0.3.0
+- Incorrectly assert_true against method which does not return true or false - Refs #16
+- System now passes mock confdata into the options hash should the ENV['RACK_ENV'] == 'test' - Fixes #16
+- The URI to the form which can add news posts to the front page is now configurable in the ~/.ardtweeno/conf.yaml file 
+- The system reads the variable newsURI and exposes the URI like eg: /b97cb9ae44747ee263363463b7e56/create/post - Refs #3
+- Front page news posts are now serialised to ~/.ardtweeno/posts.yaml - Refs #3
+- RESTAPI test fixtures were not correctly reading the mock configuration data - Fixes #15
+- Refactored RESTAPI test fixtures to now use mock configuration data as intended - Fixes #15
+- Fleshed out implementation for adding nodes to a watchlist 
+- Added test fixtures for Ardtweeno::Dispatcher#addWatch and the Ardtweeno::NodeManager#addWatch 
+- Added exceptions Ardtweeno::InvalidWatch and Ardtweeno::AlreadyWatched - Fixes #12
+- Fixed bug in the skeleton implementation for the /api/v1/watch/node it now respects the parameters passed to it - Refs #12
+- Updated README and ardtweeno-gem/README with latest changes
+- Finished basic implementation and integration of the Ardtweeno::SerialParser subsystem 
+- Added test fixtures for Ardtweeno::SerialParser subsystem - Fixes #9
+- Updated test/test_helper.rb to no longer ignore the parser_test.rb
+- Removed node.js SerialParser subsystem
+- Updated minimum Ruby version to 2.0.0p0 in the gemspec 
+- Added Twitter Bootstrap CSS and JS libraries 
+- Added skeleton implementation of the Ardtweeno::SerialParser subsystem 
+- Modified Ardtweeno::Dispatcher #start and #stop to interface with the SerialParser 
+- Refactored the Ardtweeno::Dispatcher#status? to be cleaner and easier to maintain in future
+- Added runtime dependencies to the gemspec. Fixes #14
+- Added tests to cover Ardtweeno::Dispatcher#status?
+- While running tests, Ardtweeno::Dispatcher#status? now returns mock data
+- Refactored the gateway front end to allow tabbed content. fixes #11 - Implemented front end news story serialisation. Will be finished alongside refs #3 - Fleshed out functionality of /api/v1/system/status to include system load information. fixes #8 - Removed need for authentication to access /api/v1/system/status - Added a status tab on the front end which contains a highcharts graph showing gateway system load
+- Fixes #7 Added check for packets containing empty data, now correctly raises Ardtweeno::InvalidData
+- Updated main README.md
+- Updated README.md for the tech-demo
+- Broke out Ardtweeno Gateway port for the tech-demo to this config file
+- fixes #1 - breaks out hard coded URI's to a configuration file bundled with the tech-demo application
+- Added README.md for tech-demo directory
+- Added README.md for the arduino-fio-code directory
+- Added README.md to eaglecad directory
+- Added eagle-cad schematics for two sample Ardtweeno Sample Mesh Network Nodes
+- Typo in blog URI on Ardtweeno Gateway home view
+
 ## Version 0.2.5 Engineering Release 2 RC5
 - Updated gemspec in preparation for release of ER 2
 - Updated REST API to be more robust when printing news posts

data/Gemfile.lock

@@ -1,27 +1,37 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    ardtweeno (0.2.1)
+    ardtweeno (0.2.5)
+      bson_ext (>= 1.6.2)
       bundler (>= 1.2.3)
-    bson (1.8.5)
-    bson_ext (1.8.5)
-      bson (~> 1.8.5)
+      foreman (>= 0.63.0)
+      mongo (>= 1.6.2)
+      rufus-scheduler (>= 2.0.0)
+      sinatra (>= 1.3.3)
+      sinatra (>= 1.3.3)
+      thin (>= 1.5.0)
+      typhoeus (>= 0.6.3)
+    bson (1.9.0)
+    bson_ext (1.9.0)
+      bson (~> 1.9.0)
     daemons (1.1.9)
     diff-lcs (1.2.4)
-    dotenv (0.7.0)
+    dotenv (0.8.0)
     ethon (0.5.12)
       ffi (>= 1.3.0)
       mime-types (~> 1.18)
     eventmachine (1.0.3)
-    ffi (1.8.1)
+    ffi (1.9.0)
     foreman (0.63.0)
       dotenv (>= 0.7)
       thor (>= 0.13.6)
-    json (1.7.7)
+    json (1.8.0)
     mime-types (1.23)
-    mongo (1.8.5)
-      bson (~> 1.8.5)
-    nokogiri (1.5.9)
+    mini_portile (0.5.0)
+    mongo (1.9.0)
+      bson (~> 1.9.0)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
     rack (1.5.2)
     rack-protection (1.5.0)
       rack
@@ -36,23 +46,23 @@ GEM
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.1)
-    rufus-scheduler (2.0.18)
+    rufus-scheduler (2.0.19)
       tzinfo (>= 0.3.23)
     serialport (1.1.0)
-    sinatra (1.4.2)
-      rack (~> 1.5, >= 1.5.2)
+    sinatra (1.4.3)
+      rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
-    test-unit (2.5.4)
+    test-unit (2.5.5)
     thin (1.5.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     thor (0.18.1)
-    tilt (1.3.7)
+    tilt (1.4.1)
     typhoeus (0.6.3)
       ethon (~> 0.5.11)
-    tzinfo (0.3.37)
+    tzinfo (1.0.0)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,14 +1,14 @@
 # Ardtweeno
-Ardtweeno is a distributed sensor mesh network gateway which bridges devices connected through an XBee Mesh
-Network link to those on the internet over IP. The system is modular in nature with the interface to the 
-gateway from the mesh network accessible through a HTTP REST API. This allows many different mesh networks 
-potentially at multiple sites to communicate with the centeral gateway over the internet or to a serial 
+Ardtweeno is a distributed sensor mesh network gateway which bridges devices connected through a serial
+link to those on the internet over IP. The system is modular in nature with the interface to the 
+gateway from the serial link being accessible through a HTTP REST API. This allows many different devices 
+potentially at multiple sites to communicate with the central gateway over the internet or to a serial 
 device connected locally as would be the case with a directly connected XBee Coordinator.
 
 All data is logged to a local database to allow statistical analysis and graphs to be generated for 
 inclusion in hourly/daily reports which can be attached to the systems twitter feed.
 
-The core system is wrapped in a Ruby Sinatra webbapp which exposes a HTTP REST API and allows interaction 
+The core system is wrapped in a Ruby Sinatra webapp which exposes a HTTP REST API and allows interaction 
 with the gateway over RESTful HTTP calls on the IP network. This has been designed with a Raspberry Pi in 
 mind and has been tested to work correctly on the Raspbian distribution.
 
@@ -18,18 +18,22 @@ on Rails web application to act as an end user front end to the system and displ
 graphs from data recieved on the mesh network, while also extending the feature set of the HTTP REST API
 and eventually offer the means to manage and upload updated firmwares to the mesh network nodes.
 
-This is a work in progress! The Wiki associated will soon contain the instructions for accessing the REST
-API and installation instructions shortly. Any bugs encountered can be raised on the issue tracker.
+This is a work in progress! The Wiki associated now contains the instructions for accessing the REST
+API and installation instructions. Any bugs encountered can be raised on the issue tracker.
+
+If you would like to collaborate with me on this project please fork the repository and send any changes
+through a pull request! I gladly welcome constructive input!
 
 
 
 # COPYING / Licence
-This software is released under the creative commons attribution-sharealike 3.0 unported (cc by-sa 3.0) licence.
-for more information see: http://creativecommons.org/licenses/by-sa/3.0/
+This software is released under the Creative Commons Attribution-NonCommercial 3.0 Unported (CC BY-NC 3.0)
+for more information see the full details of this licence here: http://creativecommons.org/licenses/by-nc/3.0/
+
 For information regarding commercial use of the Ardtweeno Gateway, please contact the author at:
-davidkirwanirl (_at_) gmail dot com
+davidkirwanirl (_at_) gmail dot com or through Twitter at @kirwan\_david
 
 
 # DISCLAIMER
 All code is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
-without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

data/lib/ardtweeno/configreader.rb

@@ -37,7 +37,7 @@ module Ardtweeno
       # Saves the database to disk
       def save(newData, path, options={})
         @log = options[:log] ||= Logger.new(STDOUT)
-        @log.level = Logger::DEBUG
+        @log.level = options[:level] ||= Logger::DEBUG
         
         @data = newData
         

data/lib/ardtweeno/dispatcher.rb

@@ -1,8 +1,8 @@
 ####################################################################################################
-# @author       David Kirwan <davidkirwanirl@gmail.com>
-# @description  Dispatcher system for the Ardtweeno Mesh Network
+# @author       David Kirwan https://github.com/davidkirwan/ardtweeno
+# @description  Ardtweeno dispatcher system
 #
-# @date         30-03-2013
+# @date         14-06-2013
 ####################################################################################################
 
 # Imports
@@ -24,7 +24,7 @@ module Ardtweeno
     
     include Singleton
     
-    attr_accessor :nodeManager, :parser, :confdata, :nodedata, :db, :auth, :coll, :log, :running
+    attr_accessor :nodeManager, :parser, :confdata, :nodedata, :db, :auth, :coll, :log, :running, :posts
     
     
     ##
@@ -43,7 +43,9 @@ module Ardtweeno
       @running = false
       @parser = nil
       
-      unless Ardtweeno.options[:test] ||= false
+      if Ardtweeno.options[:test]
+        @confdata = Ardtweeno.options[:confdata]
+      else
         @log.debug "Calling bootstrap()"
         bootstrap()
       end
@@ -201,28 +203,45 @@ module Ardtweeno
     # Ardtweeno::Dispatcher#addWatch method to add a watch on a node
     #
     # * *Args*    :
-    #   - ++ ->     params Hash
+    #   - ++ ->     params Hash containing: {:node String name of the node,
+    #                                        :notifyURL String URL to post a push notification to 
+    #                                        :method String either GET or PUSH to indicate HTTP methods
+    #                                        :timeout Fixnum the timeout in seconds between push notifications }
     # * *Returns* :
     #   -           
     # * *Raises* :
-    #    
+    #             Ardtweeno::InvalidWatch if params do not adhere to specification
+    #             Ardtweeno::AlreadyWatched if node is already on a watchlist
+    #
     def addWatch(params)
       begin
         apitimer = Time.now
         
-        if params.has_key? "node" and 
-           params.has_key? "notifyURL" and 
-           params.has_key? "method" and
-           params.has_key? "timeout"
-             
+        if params.has_key? :node and 
+           params.has_key? :notifyURL and 
+           params.has_key? :method and
+           params.has_key? :timeout
+          
+          
+          unless params[:method] == "GET" or params[:method] == "POST"
+            raise Ardtweeno::InvalidWatch, "Invalid Parameters"
+          end
+          
+          unless params[:timeout] >= 0
+            raise Ardtweeno::InvalidWatch, "Invalid Parameters"
+          end
+          
           @log.debug "Watch API call seems valid, passing to NodeManager"
           @nodeManager.addWatch(params)
         else
-          raise Exception, "Invalid Parameters"
+          raise Ardtweeno::InvalidWatch, "Invalid Parameters"
         end
         
         @log.debug "Duration: #{Time.now - apitimer} seconds"
-      rescue Exception => e
+        
+      rescue Ardtweeno::AlreadyWatched => e
+        raise e, "This node already has a watch associated with it"
+      rescue Ardtweeno::InvalidWatch => e
         raise e
       end
     end 
@@ -243,9 +262,11 @@ module Ardtweeno
         @log.debug "Payload recieved, processing.."
         payload = JSON.parse(origionalPayload)
           
-        if payload["data"].nil? then raise Ardtweeno::InvalidData, "Packet missing data" end
+        if payload["data"].nil? then raise Ardtweeno::InvalidData, "Packet missing data"; end
         @log.debug "Payload contains a :data key, continuing.."
-        if payload["key"].nil? then raise Ardtweeno::InvalidData, "Packet missing key" end
+        if payload["data"].empty? then raise Ardtweeno::InvalidData, "Packet data empty"; end
+        @log.debug "Payload data is not empty, continuing.."
+        if payload["key"].nil? then raise Ardtweeno::InvalidData, "Packet missing key"; end
         @log.debug "Payload contains a :key key, continuing.."
           
         @log.debug "Searching for the corresponding Ardtweeno::Node in the system.."
@@ -301,11 +322,29 @@ module Ardtweeno
             speed = @confdata["speed"]
             key = @confdata["adminkey"]
             
-            cmd = "/bin/bash -c '/usr/local/bin/node resources/serialparser.js #{dev} #{speed} #{key}'"
-                        
-            @parser = fork do
-              Signal.trap("SIGTERM") { `killall node`; exit }
-              `#{cmd}`
+            begin
+              serialparser = Ardtweeno::SerialParser.new(dev, speed, 100, {:log=>@log, :level=>@log.level})
+            rescue Exception => e
+              @log.fatal "Ardtweeno::Dispatcher#start Fatal Error constructing the SerialParser:"
+              @running = false
+              return false
+            end
+                      
+            @parser = Thread.new do
+                           
+              begin
+                loop do
+                  serialparser.listen(key)
+                end
+                
+              rescue Exception => e
+                @log.debug e.message
+                serialparser.close
+                @running = false
+                @parser.kill
+                @parser = nil
+                
+              end
             end
             
             @log.debug "Dispatcher#start has been called starting the system up.."
@@ -321,7 +360,8 @@ module Ardtweeno
           end
         end
       rescue Exception => e
-        `killall node`
+        @parser.kill
+        @parser = nil
         raise e
       end
       
@@ -346,13 +386,12 @@ module Ardtweeno
         unless Ardtweeno.options[:test]        
           unless @running == false
             
-            @log.debug "Dispatcher#stop has been called shutting system down.."
-            
-            Process.kill("SIGTERM", @parser)
-            Process.wait
+            @parser.kill
             @parser = nil
             
             @running = false
+            @log.debug "Dispatcher#stop has been called shutting system down.."
+            
             return true
             
           end
@@ -363,7 +402,7 @@ module Ardtweeno
           end
         end
       rescue Exception => e
-        `killall node`
+        @parser.kill
         @parser = nil
         raise e
       end
@@ -393,6 +432,57 @@ module Ardtweeno
       end
     end
     
+    
+    ##
+    # Ardtweeno::Dispatcher#status? returns the system status of the Ardtweeno Gateway host
+    #
+    # * *Args*    :
+    #   - ++ ->   
+    # * *Returns* :
+    #   -         Hash theResponse containing: bool running, String cpuload, String memload
+    # * *Raises* :
+    #    
+    def status?()
+      @log.debug "Ardtweeno::Dispatcher#status? executing"
+      begin
+        unless Ardtweeno.options[:test] ||= false
+          # Get CPU      
+          maxLoad = calculateCPUCores()
+        
+          # Get Avgload
+          currentLoadPercentage = calculateAvgLoad(maxLoad)
+          
+          # Get MEM Usage
+          usedMem, totalMem = calculateMemLoad()
+          
+          
+          thecpuload = '%.2f' % currentLoadPercentage
+          thememload = '%.2f' % ((usedMem / totalMem.to_f) * 100)
+                  
+          theResponse = {:running=>@running,
+                           :cpuload=>thecpuload,
+                           :memload=>thememload}
+          
+          @log.debug theResponse.inspect
+          
+          return theResponse
+          
+        else # When in testing mode, return blank data
+          theResponse = {:running=>@running,
+                           :cpuload=>0.0,
+                           :memload=>0.0}
+                           
+          @log.debug theResponse.inspect                 
+                           
+          return theResponse
+        end
+        
+      rescue Exception => e
+      
+      end  
+    end
+
+  
 
     ##
     # Ardtweeno::Dispatcher#running? checks to see if the SerialParser is running
@@ -434,7 +524,56 @@ module Ardtweeno
     
     
     ##
-    # Ardtweeno::Dispatcher#config returns the configuration as read in from the DB
+    # Ardtweeno::Dispatcher#getPostsURI returns the front page news URI ~/.ardtweeno/conf.yaml 
+    #
+    # * *Args*    :
+    #   - ++ ->   
+    # * *Returns* :
+    #   -          String which makes up the news post URI ie "/randomhash/create/post"
+    # * *Raises* :
+    #
+    def getPostsURI()
+      return @confdata["newsURI"]
+    end
+    
+    
+    
+    ##
+    # Ardtweeno::Dispatcher#getPosts returns the front page news posts loaded from ~/.ardtweeno/posts.yaml 
+    #
+    # * *Args*    :
+    #   - ++ ->   
+    # * *Returns* :
+    #   -          Array of Hash containing post data
+    # * *Raises* :
+    #
+    def getPosts()
+      unless @posts.nil? or @posts.empty?
+        return @posts["posts"]
+      else
+        return Array.new
+      end
+    end
+    
+    
+    ##
+    # Ardtweeno::Dispatcher#savePosts saves a post to ~/.ardtweeno/posts.yaml 
+    #
+    # * *Args*    :
+    #   - ++ ->   
+    # * *Returns* :
+    #   -          
+    # * *Raises* :
+    #
+    def savePosts(newPosts)
+      @posts["posts"] = newPosts
+      Ardtweeno::ConfigReader.save(@posts, Ardtweeno::POSTPATH)
+    end
+    
+    
+    ##
+    # Ardtweeno::Dispatcher#config returns the configuration as read in from the confg.yaml configuration 
+    # file
     #
     # * *Args*    :
     #   - ++ ->   
@@ -456,8 +595,7 @@ module Ardtweeno
     #   -
     # * *Raises* :
     #
-    private
-    def bootstrap()
+    def bootstrap
       
       # Read in the configuration files
       begin
@@ -465,6 +603,7 @@ module Ardtweeno
         
         @confdata = Ardtweeno::ConfigReader.load(Ardtweeno::DBPATH)
         @nodedata = Ardtweeno::ConfigReader.load(Ardtweeno::NODEPATH)
+        @posts = Ardtweeno::ConfigReader.load(Ardtweeno::POSTPATH)
 
       rescue Exception => e
         @log.fatal e.message
@@ -500,7 +639,7 @@ module Ardtweeno
         @log.debug e.message
         @log.debug e.backtrace
         raise e
-      end          
+      end
       
       
       # Create the MongoDB connector instance
@@ -532,7 +671,90 @@ module Ardtweeno
       
       
     end # End of the bootstrap()
+
+
+    def calculateMemLoad()
+      begin
+        memhash = Hash.new
+        meminfo = File.read('/proc/meminfo')
+        meminfo.each_line do |i| 
+        key, val = i.split(':')
+        if val.include?('kB') then val = val.gsub(/\s+kB/, ''); end
+          memhash["#{key}"] = val.strip
+        end
+            
+        totalMem = memhash["MemTotal"].to_i
+        freeMem = memhash["MemFree"].to_i + memhash["Buffers"].to_i + memhash["Cached"].to_i
+        usedMem = totalMem - freeMem
+            
+        @log.debug "Total Memory: #{totalMem} (100%)"
+        @log.debug "Used Memory: #{usedMem} (#{'%.2f' % ((usedMem / totalMem.to_f) * 100)}%)"
+        @log.debug "Free Memory: #{freeMem} (#{'%.2f' % ((freeMem / totalMem.to_f) * 100)}%)"
+        
+        return usedMem, totalMem
+        
+      rescue Exception => e
+        @log.debug "Some issue accessing /proc/meminfo"
+        usedMem, totalMem = 0, 0
+        
+        return usedMem, totalMem
+      end
+    end
+    
+    def calculateAvgLoad(maxLoad)
+      begin
+        loadavg = File.read('/proc/loadavg')
+        loads = loadavg.scan(/\d+.\d+/)
+        onemin = loads[0]
+        fivemin = loads[1]
+        fifteenmin = loads[2]
+            
+        @log.debug "LoadAvg are as follows: 1min #{onemin}, 5min #{fivemin}, 15min #{fifteenmin}"
+            
+        loadval = (onemin.to_f / maxLoad)
+        currentLoadPercentage = loadval * 100
+            
+        @log.debug "Currently running at #{'%.2f' % currentLoadPercentage}% of max load"
+        
+        return currentLoadPercentage
+          
+      rescue Exception => e
+        @log.debug "Some issue accessing /proc/loadavg"
+        onemin, fivemin, fifteenmin = 0, 0, 0
+        
+        loadval = (onemin.to_f / maxLoad)
+        currentLoadPercentage = loadval * 100
+        
+        return currentLoadPercentage
+      end
+    end
+    
+    
+    def calculateCPUCores()
+      begin # Checking for multi-core CPU
+        cpuinfo = File.read('/proc/cpuinfo')
+        coreinfo = cpuinfo.scan(/cpu cores\s+:\s+\d+/)
+          
+        tempVal = coreinfo[0]
+        numOfCores = tempVal.scan(/\d+/)[0].to_i
+        numOfThreadsPerCore = coreinfo.size / numOfCores
+        maxLoad = (numOfThreadsPerCore * numOfCores).to_f
+        
+        @log.debug "Found #{numOfCores} cores with #{numOfThreadsPerCore} threads per core"
+        @log.debug "Max desirable cpu load: #{maxLoad}"
+        
+        return maxLoad
+        
+      rescue Exception => e
+        @log.debug "Unable to find cpu core info in /proc/cpuinfo, assuming system has a single core"
+        maxLoad = 1.0
+        
+        return maxLoad
+      end
+    end
+    
     
+    private :bootstrap, :calculateMemLoad, :calculateAvgLoad, :calculateCPUCores
     
   end
 end

data/lib/ardtweeno/exceptions.rb

@@ -30,4 +30,10 @@ module Ardtweeno
   class SerialDeviceNotFound < Exception
   end
   
+  class InvalidWatch < Exception  
+  end
+  
+  class AlreadyWatched < Exception
+  end
+  
 end

data/lib/ardtweeno/nodemanager.rb

@@ -178,8 +178,8 @@ module Ardtweeno
       
       @watchlist.each do |i|
         
-        @log.debug "Comparing " + i[:node].node + " and " + node.node
-        if i[:node].node == node.node 
+        @log.debug "Comparing " + i[:node] + " and " + node.node
+        if i[:node] == node.node 
           return true
         end
       end
@@ -205,16 +205,22 @@ module Ardtweeno
         node = search({:node=>params[:node]})
         @log.debug "Found Node: " + node.inspect
         
-        watch = { :node=>node, 
+        if watched?(node)
+          raise Ardtweeno::AlreadyWatched
+        end
+        
+        watch = { :node=>params[:node], 
                   :notifyURL=> params[:notifyURL],
-                  :method=>"POST", 
-                  :timeout=>"60" 
+                  :method=>params[:method], 
+                  :timeout=>params[:timeout] 
                 }
         
         @log.debug "Adding watch: " + watch.inspect
         
         @watchlist << watch
-        
+      
+      rescue Ardtweeno::AlreadyWatched => e
+        raise e
       rescue Ardtweeno::NotInNodeList => e
         raise e
       rescue Exception => e
@@ -238,7 +244,7 @@ module Ardtweeno
         node = search({:node=>node})
         
         @watchlist.each do |i|
-          if i[:node] == node
+          if i[:node] == node.node
             @watchlist.delete(i)
           end
         end