rflow 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 325fd6dd2c2d5409dc692a641c36da3b2139f7e8
-  data.tar.gz: d71bb8ce7e17c7e86fc1e2de7f299e73efdaeb5a
+  metadata.gz: b847e06bbad6d47e7cd74314add6f499c99c8bc9
+  data.tar.gz: f707f01ec81e823d8c08711bf747f1a57b6a15a6
 SHA512:
-  metadata.gz: e5a602dc11534aa9a48b81bfc5d2035103b048b67d96684587f84c03152f90b415a43f6e19050616cbdccd37cfbad3ddf67e5c45ecfb4690c2dd40cfaa1b5883
-  data.tar.gz: e7d78c206614c6df0824b4d87f50a1c48edb54468defc498f5fa2319b05c707a4a4ee440514a8a11058998202b76ab93885859a8a50b1dbe85bc33bc82a5c041
+  metadata.gz: a5791ba65d956750314d374c00fb21bafcaa152a356331d41134929befaf9488f7519da287b796833430300f5f5aafb892465648ee54a6b8acdc3c1503181427
+  data.tar.gz: bf9ebdb5eac95bd3307f86b54d23b872cd6365fd32db98daa962cd5c109f404c8bf3a9d3ebcc36d5b0c12fb7223b1c8d55b61e62678484fd12f5ca6292ac58e4

data/bin/rflow

@@ -4,6 +4,11 @@
 # startup cases (version and help) that don't need it
 require 'optparse'
 
+if Process::Sys.geteuid == 0
+  STDERR.puts "Error: RFlow will not run as root."
+  exit 1
+end
+
 options = {
   :daemonize => true,
   :startup_log_level => :INFO,
@@ -186,17 +191,22 @@ end
 options[:extensions_file_paths].each do |extensions_file_path|
   RFlow.logger.info "Loading #{extensions_file_path}"
   unless File.readable? extensions_file_path
-    RFlow.logger.fatal "Extensions file ('#{Dir.getwd}') '#{extensions_file_path}' not reabable\n#{option_parser.help}"
+    RFlow.logger.fatal "Extensions file ('#{Dir.getwd}') '#{extensions_file_path}' not readable\n#{option_parser.help}"
+    exit 1
+  end
+  begin
+    load extensions_file_path
+  rescue Exception => e
+    RFlow.logger.fatal "Error running rflow: #{e.class}: #{e.message}, because: #{e.backtrace}"
     exit 1
   end
-  load extensions_file_path
 end
 
 # Start the flow
 begin
   RFlow.run! options[:config_database_path], options[:daemonize]
 rescue Exception => e
-  RFlow.logger.fatal "Error running rflow: #{e.class}: #{e.message}"
+  RFlow.logger.fatal "Error running rflow: #{e.class}: #{e.message}, because: #{e.backtrace}"
   exit(1)
 end
 

data/example/http_extensions.rb

@@ -102,7 +102,7 @@ class HTTPServer < RFlow::Component
     return unless message.data_type_name == 'HTTPResponse'
 
     RFlow.logger.debug 'Received a HTTPResponse message, determining if its mine'
-    my_events = message.provenance.find_all {|processing_event| processing_event.component_instance_uuid == instance_uuid}
+    my_events = message.provenance.find_all {|processing_event| processing_event.component_instance_uuid == uuid}
     RFlow.logger.debug "Found #{my_events.size} processing events from me"
 
     # Attempt to send the data to each context match
@@ -136,7 +136,7 @@ class HTTPServer < RFlow::Component
     def process_http_request
       RFlow.logger.debug "Received a full HTTP request from #{client_ip}:#{client_port}"
 
-      processing_event = RFlow::Message::ProcessingEvent.new(server.instance_uuid, Time.now.utc)
+      processing_event = RFlow::Message::ProcessingEvent.new(server.uuid, Time.now.utc)
 
       request_message = RFlow::Message.new('HTTPRequest')
       request_message.data.path = @http_request_uri

data/lib/rflow/components.rb

@@ -2,5 +2,6 @@ require 'rflow/component'
 require 'rflow/components/clock'
 require 'rflow/components/integer'
 require 'rflow/components/raw'
+require 'rflow/components/log'
 require 'rflow/components/replicate'
 require 'rflow/components/ruby_proc_filter'

data/lib/rflow/components/log.rb

@@ -0,0 +1,34 @@
+class RFlow
+  module Components
+    module Log
+      module Extensions
+        module LogExtension
+          def self.extended(base_data)
+            base_data.data_object ||= {'timestamp' => 0, 'level' => 'INFO', 'text' => ''}
+          end
+
+          def timestamp; data_object['timestamp']; end
+          def timestamp=(new_timestamp); data_object['timestamp'] = new_timestamp; end
+          def level; data_object['level']; end
+          def level=(new_level); data_object['level'] = new_level; end
+          def text; data_object['text']; end
+          def text=(new_text); data_object['text'] = new_text; end
+        end
+      end
+
+      SCHEMA_DIRECTORY = ::File.expand_path(::File.join(::File.dirname(__FILE__), '..', '..', '..', 'schema'))
+
+      SCHEMA_FILES = {
+        'log.avsc' => 'RFlow::Message::Data::Log',
+      }
+
+      SCHEMA_FILES.each do |file_name, data_type_name|
+        schema_string = ::File.read(::File.join(SCHEMA_DIRECTORY, file_name))
+        RFlow::Configuration.add_available_data_type data_type_name, 'avro', schema_string
+      end
+
+      RFlow::Configuration.add_available_data_extension('RFlow::Message::Data::Log',
+                                                        RFlow::Components::Log::Extensions::LogExtension)
+    end
+  end
+end

data/lib/rflow/daemon_process.rb

@@ -111,9 +111,15 @@ class RFlow
 
     def handle_signals
       ['SIGTERM', 'SIGINT', 'SIGQUIT', 'SIGCHLD'].each do |signal|
-        trap_signal(signal) do
+        trap_signal(signal) do |return_code|
+          exit_status = if signal == 'SIGCHLD'
+                          pid, status = Process.wait2
+                          status.exitstatus
+                        else
+                          0
+                        end
           shutdown! signal
-          exit! 0
+          exit! exit_status
         end
       end
 
@@ -136,11 +142,12 @@ class RFlow
 
     def trap_signal(signal)
       # Log4r and traps don't mix, so we need to put it in another thread
+      return_code = $?
       context = clone_logging_context
       Signal.trap signal do
         Thread.new do
           apply_logging_context context
-          yield
+          yield return_code
         end.join
       end
     end
@@ -155,7 +162,11 @@ class RFlow
     def signal_subprocesses(signal)
       subprocesses.reject {|p| p.pid.nil? }.each do |p|
         RFlow.logger.info "Signaling #{p.name} with #{signal}"
-        Process.kill(signal, p.pid)
+        begin
+          Process.kill(signal, p.pid)
+        rescue Errno::ESRCH
+          # process already died and was waited for, ignore
+        end
       end
     end
 

data/lib/rflow/version.rb

@@ -1,3 +1,3 @@
 class RFlow
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/rflow.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ['lib']
+  s.bindir        = 'bin'
 
   s.add_dependency 'uuidtools', '~> 2.1'
   s.add_dependency 'log4r', '~> 1.1'

data/schema/log.avsc

@@ -0,0 +1,11 @@
+{
+  "type": "record",
+  "name": "Log",
+  "namespace": "org.rflow.message.log",
+  "aliases": [],
+  "fields": [
+    {"name": "timestamp", "type": "long"},
+    {"name": "level", "type": "string"},
+    {"name": "text", "type": "string"}
+  ]
+}

data/spec/rflow/message/data/log_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+require 'rflow/components/log'
+
+class RFlow
+  class Message
+    class Data
+      describe 'Log Avro Schema' do
+        let(:schema) { Configuration.available_data_types['RFlow::Message::Data::Log']['avro'] }
+
+        it 'should load the schema' do
+          expect(schema).not_to be_nil
+        end
+
+        it 'should support assignment of properties' do
+          message = RFlow::Message.new('RFlow::Message::Data::Log')
+          timestamp = Time.now.to_i
+          message.data.timestamp = timestamp
+          message.data.level = 'INFO'
+          message.data.text = 'message'
+
+          result = decode_avro(schema, encode_avro(schema, message.data.to_hash))
+          expect(result['timestamp']).to eq timestamp
+          expect(result['level']).to eq 'INFO'
+          expect(result['text']).to eq 'message'
+        end
+
+        it 'should encode and decode an object' do
+          log = {'timestamp' => Time.now.to_i, 'level' => 'LOGLEVEL', 'text' => 'Log message'}
+
+          expect { encode_avro(schema, log) }.to_not raise_error
+          encoded = encode_avro(schema, log)
+
+          expect { decode_avro(schema, encoded) }.to_not raise_error
+          decoded = decode_avro(schema, encoded)
+
+          expect(decoded).to eq(log)
+          expect(decoded['text']).to eq(log['text'])
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rflow
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - John Stoneham
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
@@ -215,6 +215,7 @@ files:
 - lib/rflow/components.rb
 - lib/rflow/components/clock.rb
 - lib/rflow/components/integer.rb
+- lib/rflow/components/log.rb
 - lib/rflow/components/raw.rb
 - lib/rflow/components/replicate.rb
 - lib/rflow/components/ruby_proc_filter.rb
@@ -242,6 +243,7 @@ files:
 - lib/rflow/shard.rb
 - lib/rflow/version.rb
 - rflow.gemspec
+- schema/log.avsc
 - schema/message.avsc
 - schema/raw.avsc
 - schema/tick.avsc
@@ -253,6 +255,7 @@ files:
 - spec/rflow/forward_to_input_port_spec.rb
 - spec/rflow/forward_to_output_port_spec.rb
 - spec/rflow/logger_spec.rb
+- spec/rflow/message/data/log_spec.rb
 - spec/rflow/message/data/raw_spec.rb
 - spec/rflow/message/data_spec.rb
 - spec/rflow/message_spec.rb
@@ -278,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Ruby flow-based programming framework
@@ -291,9 +294,9 @@ test_files:
 - spec/rflow/forward_to_input_port_spec.rb
 - spec/rflow/forward_to_output_port_spec.rb
 - spec/rflow/logger_spec.rb
+- spec/rflow/message/data/log_spec.rb
 - spec/rflow/message/data/raw_spec.rb
 - spec/rflow/message/data_spec.rb
 - spec/rflow/message_spec.rb
 - spec/rflow_spec.rb
 - spec/spec_helper.rb
-has_rdoc: