rsmp 0.8.4 → 0.9.1

data/lib/rsmp/components.rb

@@ -3,7 +3,7 @@
 module RSMP
   module Components
     attr_reader :components
-    
+
     def initialize_components
       @components = {}
     end
@@ -25,10 +25,10 @@ module RSMP
 
     def check_main_component settings
       unless settings['main'] && settings['main'].size >= 1
-        raise ConfigurationError.new("main component must be defined") 
+        raise ConfigurationError.new("main component must be defined")
       end
       if settings['main'].size > 1
-        raise ConfigurationError.new("only one main component can be defined, found #{settings['main'].keys.join(', ')}") 
+        raise ConfigurationError.new("only one main component can be defined, found #{settings['main'].keys.join(', ')}")
       end
     end
 

data/lib/rsmp/convert/export/json_schema.rb

@@ -23,7 +23,7 @@ module RSMP
 
         def self.build_value item
           out = {}
-          
+
           if item['description']
             out["description"] = item['description']
           end
@@ -95,7 +95,7 @@ module RSMP
             }
           end
           json = {
-            "properties" => { 
+            "properties" => {
               "aCId" => { "enum" => items.keys.sort },
               "rvs" => { "items" => { "allOf" => list } }
             }
@@ -175,7 +175,7 @@ module RSMP
               }
             ]
           }
-          out["sxl.json"] = output_json json     
+          out["sxl.json"] = output_json json
         end
 
         def self.generate sxl
@@ -192,7 +192,7 @@ module RSMP
           out.each_pair do |relative_path,str|
             path = File.join(folder, relative_path)
             FileUtils.mkdir_p File.dirname(path)      # create folders if needed
-            file = File.open(path, 'w+')      # w+ means truncate or create new file 
+            file = File.open(path, 'w+')      # w+ means truncate or create new file
             file.puts str
           end
         end

data/lib/rsmp/convert/import/yaml.rb

@@ -24,7 +24,7 @@ module RSMP
             commands: {}
           }
 
-          yaml['objects'].each_pair do |type,object|  
+          yaml['objects'].each_pair do |type,object|
             object["alarms"].each { |id,item| sxl[:alarms][id] = item }
             object["statuses"].each { |id,item| sxl[:statuses][id] = item }
             object["commands"].each { |id,item| sxl[:commands][id] = item }

data/lib/rsmp/deep_merge.rb

@@ -1,5 +1,6 @@
 class Hash
   def deep_merge(other_hash)
+    return self unless other_hash
     self.merge(other_hash) do |key, old, fresh|
       if old.is_a?(Hash) && fresh.is_a?(Hash)
         old.deep_merge(fresh)

data/lib/rsmp/error.rb

@@ -64,7 +64,4 @@ module RSMP
 
 	class RepeatedStatusError < Error
 	end
-
-	class TimestampError < Error
-	end
 end

data/lib/rsmp/inspect.rb

@@ -1,5 +1,5 @@
 # Costume inspect, to reduce noise
-# 
+#
 # Instance variables of classes starting with Async or RSMP are shown
 # with only their class name and object id, which reduces output,
 # especially for deep object structures.

data/lib/rsmp/logger.rb

@@ -2,7 +2,7 @@ module RSMP
   class Logger
 
     attr_accessor :settings
-    
+
     def initialize settings={}
       defaults = {
         'active'=>true,
@@ -115,7 +115,7 @@ module RSMP
             end
           end
         end
-        return false if ack && @settings["acknowledgements"] == false && 
+        return false if ack && @settings["acknowledgements"] == false &&
           [:not_acknowledged,:warning,:error].include?(item[:level]) == false
       end
       true
@@ -159,7 +159,7 @@ module RSMP
 
     def log item, force:false
       if output?(item, force)
-        output item[:level], build_output(item) 
+        output item[:level], build_output(item)
       end
     end
 
@@ -169,7 +169,7 @@ module RSMP
       else
         ' '*length
       end
-    end 
+    end
 
     def dump archive, force:false, num:nil
       num ||= archive.items.size
@@ -183,7 +183,7 @@ module RSMP
     def build_part parts, item, key, &block
       skey = key.to_s
       return unless @settings[skey]
-      
+
       part = item[key]
       part = yield part if block
       part = part.to_s

data/lib/rsmp/logging.rb

@@ -8,7 +8,7 @@ module RSMP
 
     def initialize_logging options
       @archive = options[:archive] || RSMP::Archive.new
-      @logger = options[:logger] || RSMP::Logger.new(options[:log_settings]) 
+      @logger = options[:logger] || RSMP::Logger.new(options[:log_settings])
     end
 
     def author

data/lib/rsmp/message.rb

@@ -188,7 +188,7 @@ module RSMP
   class Unknown < Message
   end
 
-  class AggregatedStatus < Message 
+  class AggregatedStatus < Message
     def initialize attributes = {}
       super({
         "type" => "AggregatedStatus",

data/lib/rsmp/node.rb

@@ -3,14 +3,14 @@
 module RSMP
   class Node
     include Logging
-    include Wait
     include Inspect
+    include Task
 
     attr_reader :archive, :logger, :task, :deferred, :error_queue, :clock, :collector
 
     def initialize options
       initialize_logging options
-      @task = options[:task]
+      initialize_task
       @deferred = []
       @clock = Clock.new
       @error_queue = Async::Queue.new
@@ -18,6 +18,13 @@ module RSMP
       @collect = options[:collect]
     end
 
+    # stop proxies, then call super
+    def stop_subtasks
+      @proxies.each { |proxy| proxy.stop }
+      @proxies.clear
+      super
+    end
+
     def ignore_errors classes, &block
       was, @ignore_errors = @ignore_errors, [classes].flatten
       yield
@@ -50,55 +57,13 @@ module RSMP
 
     def clear_deferred
       @deferred.clear
-    end    
-
-    def do_start task
-      task.annotate self.class.to_s
-      @task = task
-      start_action
-      idle
-    end
-
-    def start
-      starting
-      if @task
-        do_start @task
-      else
-        Async do |task|
-          do_start task
-        end
-      end
-    rescue Errno::EADDRINUSE => e
-      log "Cannot start: #{e.to_s}", level: :error
-    rescue SystemExit, SignalException, Interrupt
-      @logger.unmute_all
-      exiting
-    end
-
-    def idle
-      loop do
-        @task.sleep 60
-      end
-    end
-
-    def stop
-      @task.stop if @task
-    end
-
-    def restart
-      stop
-      start
-    end
-
-    def exiting
-      log "Exiting", level: :info
     end
 
     def check_required_settings settings, required
       raise ArgumentError.new "Settings is empty" unless settings
       required.each do |setting|
         raise ArgumentError.new "Missing setting: #{setting}" unless settings.include? setting.to_s
-      end 
+      end
     end
 
     def author