opener-daemons 0.7.1 → 0.8.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTQ4M2FiNDUwMzBhM2Q3ZTBhZjdlODM1ZjJkOWI5YWZiNzIxYjhkNg==
+    ODdlMTlmMWVmODEwYjhhYmUwNDk0ZjdhMjFlMWIwZTg3ZjU3ZTZmNQ==
   data.tar.gz: !binary |-
-    YTJjODBiN2IzMjVjNjkwNzZmZTY4ZTI2MTk4NjU4NzlkYmE0ZWViYg==
+    NzQ3MTczMjY3ZDE1ZjM5ZmExYjQ0ZTRlN2FjMGZhYTA3NDI0MDQzYQ==
 SHA512:
   metadata.gz: !binary |-
-    NDJkOWU3YzU0NzJkMjM2MDUxYjc2OWQ5MDM2YjNjMGY1NGIzOTA1NGEwYmI1
-    NjRjZmRlYjFhN2M0NTU5ZGEzN2UwNTNhNzFkMGRlM2RkMWZjZmFhYmQ4NDk5
-    NmE2NTg0ODJiMTEyN2VjZjRhNGU2MjQ2YjBkZWNjNzVkOGVkNzQ=
+    ODViNjAwNTA0NWZjMDI5MzA4MzljZmU2ZTgwODYzYjdjYzQ2OTdjMWE2ZTM2
+    MDJmYmE1MDNkY2I2MmY5Y2Y1M2JmZDc1ODNjMTZmZTJmOGM4ZjNkZTQ2MTc2
+    YTdkNTU0NDBmNjlmMmNjYzRlY2NjYjk5ZDU2NzgzMTIxMWI1YWM=
   data.tar.gz: !binary |-
-    ZTZiOWIwNTEwN2MxZWU2NWY5YzQ0MDdkNWI5NDBmYjM5YzFiYmE5ODEwZWMy
-    Mjk0YWY4NmZjYTQ4NTMyYjIzNTE2ODNhNjQ1YThiODUzM2FhNWQyZWU5NWNi
-    NzIzZDRiMDVmZjZhNzFhYjI4YWQ2ZmZiZWYxZTg5NTQ4ZjMyMDc=
+    NDBhMzkxZTUxODI2ZjczYjc4MmNkMmQ3ODc4MDZhOGIxNzE3MjBjOWI4NDBk
+    YWU1MmMwZjM1MDBmYTE3YWZiMjA3YWJlMGViZjhiODYzMzIyZGFlY2ZhOTE5
+    OWIxYjQzNzMyZDI3OTk2MGQwODEwYTEwZWMxOTc3MzE4NTQwODI=

data/lib/opener/daemons/controller.rb

@@ -44,15 +44,15 @@ module Opener
       def options
         return @options if @options
         args = ARGV.dup
-        @options = Opener::Daemons::OptParser.parse!(args)
+        @options = Opener::Daemons::OptParser.pre_parse!(args)
       end
 
 
       def pid_path
         return @pid_path unless @pid_path.nil?
-        @pid_path = if @options[:pid]
+        @pid_path = if options[:pid]
                       File.expand_path(@options[:pid])
-                    elsif @options[:pidpath]
+                    elsif options[:pidpath]
                       File.expand_path(File.join(@options[:pidpath], "#{name}.pid"))
                     else
                       "/var/run/#{File.basename($0, ".rb")}.pid"
@@ -79,7 +79,7 @@ module Opener
             pid = pid.to_s.gsub(/[^0-9]/,'')
           end
         rescue => e
-          STDOUT.puts "Info: Unable to open #{pid_path} for reading:\n\t" +
+          STDOUT.puts "Info: Unable to open #{pid_path} for reading while checking for existing PID:\n\t" +
             "(#{e.class}) #{e.message}"
         end
 

data/lib/opener/daemons/opt_parser.rb

@@ -18,6 +18,16 @@ module Opener
         process(:parse!, args)
       end
 
+      def pre_parse!(args)
+        delete_double_dash = false
+        process(:parse!, args, delete_double_dash)
+      end
+
+      def pre_parse(args)
+        delete_double_dash = false
+        process(:parse, args, delete_double_dash)
+      end
+
       def self.parse(args)
         new.parse(args)
       end
@@ -26,9 +36,18 @@ module Opener
         new.parse!(args)
       end
 
+      def self.pre_parse!(args)
+        new.pre_parse!(args)
+      end
+
+      def self.pre_parse(args)
+        new.pre_parse(args)
+      end
+
       private
 
-      def process(call, args)
+      def process(call, args, delete_double_dash=true)
+        args.delete("--") if delete_double_dash
         option_parser.send(call, args)
         return options
       end
@@ -37,7 +56,12 @@ module Opener
         script_name = File.basename($0, ".rb")
 
         OptionParser.new do |opts|
-          opts.banner = "Usage: #{script_name} <start|stop|restart> [options]"
+          if block_given?
+            opts.banner = "Usage: #{script_name} <start|stop|restart> [daemon_options] -- [component_options]"
+          else
+            opts.banner = "Usage: #{script_name} <start|stop|restart> [options]"
+          end
+
           opts.separator ""
           opts.separator "When calling #{script_name} without <start|stop|restart> the daemon will start as a foreground process"
           opts.separator ""
@@ -51,43 +75,43 @@ module Opener
 
           opts.separator "Daemon options:"
 
-          opts.on("-i", "--input INPUT_QUEUE_NAME", "Input queue name") do |v|
+          opts.on("-i", "--input QUEUE_NAME", "Input queue name") do |v|
             options[:input_queue] = v
           end
 
-          opts.on("-o", "--output OUTPUT_QUEUE_NAME", "Output queue name") do |v|
+          opts.on("-o", "--output QUEUE_NAME", "Output queue name") do |v|
             options[:output_queue] = v
           end
 
-          opts.on("--batch-size ITEMS", Integer, "Request x messages at once where x is between 1 and 10") do |v|
+          opts.on("--batch-size COUNT", Integer, "Request x messages at once where x is between 1 and 10") do |v|
             options[:batch_size] = v
           end
 
-          opts.on("--buffer-size ITEMS", Integer, "Size of input and output buffer. Defaults to 4 * batch-size") do |v|
+          opts.on("--buffer-size COUNT", Integer, "Size of input and output buffer. Defaults to 4 * batch-size") do |v|
             options[:buffer_size] = v
           end
 
-          opts.on("--sleep-interval TIME_IN_SECONDS", Integer, "The interval to sleep when the queue is empty (seconds)") do |v|
+          opts.on("--sleep-interval SECONDS", Integer, "The interval to sleep when the queue is empty (seconds)") do |v|
             options[:sleep_interval] = v
           end
 
-          opts.on("-w", "--workers NUMBER", Integer, "number of worker thread") do |v|
-            options[:workers] = v
+          opts.on("-r", "--readers COUNT", Integer, "number of reader threads") do |v|
+            options[:readers] = v
           end
 
-          opts.on("-r", "--readers NUMBER", Integer, "number of reader threads") do |v|
-            options[:readers] = v
+          opts.on("-w", "--workers COUNT", Integer, "number of worker thread") do |v|
+            options[:workers] = v
           end
 
-          opts.on("-p", "--writers NUMBER", Integer, "number of writer / pusher threads") do |v|
+          opts.on("-p", "--writers COUNT", Integer, "number of writer / pusher threads") do |v|
             options[:writers] = v
           end
 
-          opts.on("--log FILENAME", "Filename and path of logfile. Defaults to STDOUT") do |v|
+          opts.on("-l", "--logfile FILENAME", "--log FILENAME", "Filename and path of logfile. Defaults to STDOUT") do |v|
             options[:log] = v
           end
 
-          opts.on("--pidfile FILENAME", "--pid FILENAME", "Filename and path of pidfile. Defaults to /var/run/#{script_name}.pid") do |v|
+          opts.on("-P", "--pidfile FILENAME", "--pid FILENAME", "Filename and path of pidfile. Defaults to /var/run/#{script_name}.pid") do |v|
             options[:pid] = v
           end
 
@@ -109,7 +133,7 @@ module Opener
 
           # No argument, shows at tail.  This will print an options summary.
           # Try it and see!
-          opts.on_tail("-h", "--help", "Show this message") do
+          opts.on_tail("-h", "--help", "Show this message. Usage: #{script_name} -h") do
             puts opts
             exit
           end

data/lib/opener/daemons/version.rb

@@ -1,5 +1,5 @@
 module Opener
   module Daemons
-    VERSION = "0.7.1"
+    VERSION = "0.8.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opener-daemons
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Wilco van Duinkerken