rflow 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a854e3c0cf56feae660eb061c29d9cbaad028a34
-  data.tar.gz: ac21f337ed623cb7a0a96c8612dc17f5e1e63bd2
+SHA256:
+  metadata.gz: 5206f9445f15732c6d46b1c08ab99abf54fbae0bc30b151418b3b950624d041a
+  data.tar.gz: 4db080a15115b86926acd0ebf78b74532fd4c22f79454eda00372236701550f7
 SHA512:
-  metadata.gz: d580e43a06b900a9cfcb8cd7372d933b698f5dc28c40909a1a2ed4211c342af497829f44e3699b520499dfd7007e70fc6925c88b8354a63278d6402cd504f5bc
-  data.tar.gz: b5d50e712d85913f0052e3a3c3cd5d2c73a4e69280af1cc0d3f92aa1fcc8917181db8a7d5288b1cab17787161543945023f6b170a47cc9d883428197d35173a0
+  metadata.gz: 0de374d5901f28cb15b320b455a8c09a4f191f71b8f8d8695d56ba74987dbc9ef86d5207bacda72d062ca7848c3860853eee8373d471c8aa769aed59e7bdbdf4
+  data.tar.gz: f273b7870a878b1672857d0b2e33fb49885e29945cc3b3e6748bbbd559ce4e9b6cf044029a2f5fe5b1278d6b0c8904d4d0668f57d6a57153ae754656688cf187

data/.ruby-version

@@ -1 +1 @@
-ruby-2.3.1
+ruby-2.5.3

data/.travis.yml

@@ -6,6 +6,8 @@ rvm:
   - 2.1.0
   - 2.2.0
   - 2.3.0
+  - 2.4.2
+  - 2.5.3
 
 before_install:
   - sudo apt-get install libtool autoconf automake uuid-dev build-essential

data/bin/rflow

@@ -86,6 +86,13 @@ end
 # things, like the config database.  We want those log messages to go to the
 # startup log when setting up.  The running log will transition to what is
 # specified in the config database.
+if options[:startup_log_file_path] &&
+  File.exist?(options[:startup_log_file_path]) &&
+  !File.writable?(options[:startup_log_file_path])
+  STDERR.puts "Startup log file '#{options[:startup_log_file_path]}' not writable"
+  exit 1
+end
+
 RFlow.logger.reconfigure({'rflow.application_name' => 'startup',
                           'rflow.log_level' => options[:startup_log_level].to_s,
                           'rflow.log_file_path' => options[:startup_log_file_path]}, true)
@@ -101,6 +108,11 @@ if options[:config_file_path] && command != 'load'
   exit 1
 end
 
+if !options[:config_file_path] && command == 'load'
+  RFlow.logger.fatal "Config file required for 'load' command"
+  exit 1
+end
+
 unless options[:config_database_path]
   RFlow.logger.warn "Config database not specified, using default 'config.sqlite'"
   options[:config_database_path] = File.expand_path(File.join(Dir.getwd, 'config.sqlite'))
@@ -110,19 +122,18 @@ case command
 when 'load'
   # Load the database with the config file, if it exists.  Will
   # otherwise default values (not very useful)
-  if options[:config_file_path]
-    unless File.exist? options[:config_file_path]
-      RFlow.logger.fatal "Config file '#{options[:config_file_path]}' not found\n#{option_parser.help}"
-      exit 1
-    end
 
-    unless File.readable? options[:config_file_path]
-      RFlow.logger.fatal "Config file '#{options[:config_file_path]}' not readable\n#{option_parser.help}"
-      exit 1
-    end
+  unless File.exist? options[:config_file_path]
+    RFlow.logger.fatal "Config file '#{options[:config_file_path]}' not found"
+    exit 1
+  end
+
+  unless File.readable? options[:config_file_path]
+    RFlow.logger.fatal "Config file '#{options[:config_file_path]}' not readable"
+    exit 1
   end
 
-  if File.exist? options[:config_database_path]
+  if File.exist?(options[:config_database_path]) && File.size(options[:config_database_path]) > 0
     RFlow.logger.fatal "Config database '#{options[:config_database_path]}' exists, exiting to prevent accidental overwrite from config file '#{options[:config_file_path]}'"
     exit 1
   end
@@ -131,11 +142,11 @@ when 'load'
   begin
     config = RFlow::Configuration::initialize_database(options[:config_database_path], options[:config_file_path])
   rescue Exception => e
-    RFlow.logger.fatal "Error initializing configuration database: #{e.message}: #{e.backtrace.join "\n"}"
+    RFlow.logger.fatal "Error initializing configuration database #{options[:config_database_path]}: #{e.message}: #{e.backtrace.join "\n"}"
     exit 1
   end
 
-  RFlow.logger.warn "Successfully initialized database '#{options[:config_database_path]}' with '#{options[:config_file_path]}'"
+  RFlow.logger.info "Successfully initialized database '#{options[:config_database_path]}' with '#{options[:config_file_path]}'"
   RFlow.logger.debug config.to_s
   exit 0
 end
@@ -144,7 +155,11 @@ end
 begin
   config = RFlow::Configuration.new(options[:config_database_path])
 rescue Exception => e
-  RFlow.logger.fatal "Error loading config database: #{e.class} - #{e.message}"
+  if e.is_a?(ArgumentError) && e.message =~ /Invalid schema in configuration database/
+    RFlow.logger.fatal "RFlow configuration database #{options[:config_database_path]} appears to be empty or missing. Perhaps you need to run 'rflow load -c <config file> -d #{options[:config_database_path]}'? (#{e.message})"
+  else
+    RFlow.logger.fatal "Error loading config database: #{e.class} - #{e.message}"
+  end
   exit 1
 end
 
@@ -191,13 +206,17 @@ 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 readable\n#{option_parser.help}"
+    RFlow.logger.fatal "Extensions file ('#{Dir.getwd}') '#{extensions_file_path}' not readable"
     exit 1
   end
   begin
     load extensions_file_path
   rescue Exception => e
-    RFlow.logger.fatal "Error running rflow: #{e.class}: #{e.message}, because: #{e.backtrace}"
+    if e.is_a?(ActiveRecord::RecordInvalid)
+      RFlow.logger.fatal "Error running rflow: It appears you may have passed a Ruby RFlow DSL file instead of an extensions file (which loads your application code) to rflow start -e #{extensions_file_path}. Please recheck your command arguments. (#{e.class}: #{e.message})"
+    else
+      RFlow.logger.fatal "Error running rflow: #{e.class}: #{e.message}, because: #{e.backtrace}"
+    end
     exit 1
   end
 end

data/lib/rflow/child_process.rb

@@ -103,7 +103,7 @@ class RFlow
     def handle_signals
       Signal.trap 'SIGCHLD', 'DEFAULT' # make sure child process can run subshells
 
-      ['SIGTERM', 'SIGINT', 'SIGQUIT'].each do |signal|
+      ['SIGTERM', 'SIGINT', 'SIGQUIT', 'SIGHUP'].each do |signal|
         trap_signal(signal) do
           shutdown! signal
           exit! 0
@@ -124,7 +124,7 @@ class RFlow
     end
 
     def unhandle_signals
-      ['SIGTERM', 'SIGINT', 'SIGQUIT', 'SIGCHLD', 'SIGUSR1', 'SIGUSR2', SIGINFO].each do |signal|
+      ['SIGTERM', 'SIGINT', 'SIGQUIT', 'SIGHUP', 'SIGCHLD', 'SIGUSR1', 'SIGUSR2', SIGINFO].each do |signal|
         Signal.trap signal, 'DEFAULT'
       end
     end

data/lib/rflow/daemon_process.rb

@@ -129,7 +129,7 @@ class RFlow
     end
 
     def handle_signals
-      ['SIGTERM', 'SIGINT', 'SIGQUIT', 'SIGCHLD'].each do |signal|
+      ['SIGTERM', 'SIGINT', 'SIGQUIT', 'SIGHUP', 'SIGCHLD'].each do |signal|
         trap_signal(signal) do |return_code|
           exit_status = if signal == 'SIGCHLD'
                           pid, status = Process.wait2
@@ -159,7 +159,7 @@ class RFlow
     end
 
     def unhandle_signals
-      ['SIGTERM', 'SIGINT', 'SIGQUIT', 'SIGCHLD', 'SIGUSR1', 'SIGUSR2', SIGINFO].each do |signal|
+      ['SIGTERM', 'SIGINT', 'SIGQUIT', 'SIGCHLD', 'SIGHUP', 'SIGUSR1', 'SIGUSR2', SIGINFO].each do |signal|
         Signal.trap signal, 'DEFAULT'
       end
     end

data/lib/rflow/logger.rb

@@ -133,7 +133,9 @@ class RFlow
         begin
           internal_logger.add FileOutputter.new('rflow.log_file', :filename => log_file_path, :formatter => LOG_PATTERN_FORMATTER)
         rescue Exception => e
-          raise ArgumentError, "Log file '#{File.expand_path log_file_path}' problem: #{e.message}\n#{e.backtrace.join("\n")}"
+          # at least output the failure to stderr
+          internal_logger.add StderrOutputter.new('rflow_stderr', :formatter => LOG_PATTERN_FORMATTER)
+          raise ArgumentError, "Log file '#{File.expand_path log_file_path}' problem: #{e.message}"
         end
       end
     end

data/lib/rflow/message.rb

@@ -1,6 +1,10 @@
 require 'stringio'
 require 'time'
-require 'avro'
+if Gem::Version.create(RUBY_VERSION) >= Gem::Version.create('2.1')
+  require 'avro-patches'
+else
+  require 'avro'
+end
 require 'rflow/configuration'
 
 class RFlow

data/lib/rflow/pid_file.rb

@@ -35,6 +35,10 @@ class RFlow
       end
       pid_fp = begin
                  File.open(tmp_path, File::RDWR|File::CREAT|File::EXCL, 0644)
+               rescue Errno::ENOENT => e
+                 RFlow.logger.fatal "Error while writing temp PID file '#{tmp_path}'; containing directory may not exist?"
+                 RFlow.logger.fatal "Exception #{e.class}: #{e.message}"
+                 abort
                rescue Errno::EACCES => e
                  RFlow.logger.fatal "Access error while writing temp PID file '#{tmp_path}'"
                  RFlow.logger.fatal "Exception #{e.class}: #{e.message}"

data/lib/rflow/version.rb

@@ -1,4 +1,4 @@
 class RFlow
   # The gem version.
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 end

data/rflow.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'activerecord', '~> 4.0'
 
   s.add_dependency 'avro', '~> 1.8'
+  s.add_dependency 'avro-patches', '~> 0.4' # update patches to official avro
   s.add_dependency 'em-zeromq', '~> 0.5'
 
   s.add_development_dependency 'bundler', '~> 1.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rflow
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - John Stoneham
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-03 00:00:00.000000000 Z
+date: 2018-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
@@ -95,6 +95,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: avro-patches
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: em-zeromq
   requirement: !ruby/object:Gem::Requirement
@@ -281,7 +295,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: A Ruby flow-based programming framework