daemons 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e59f2e1546ffdb0c31f593a15204e5a027e64392
-  data.tar.gz: da329109adb90ff065d7ae0e7dd6b0238d83862d
+  metadata.gz: 17b967e5ea806bd2c6f2a7def92dd15da0d267fc
+  data.tar.gz: 2e2fc8ad98d898e03eff7106a676ec55b9121887
 SHA512:
-  metadata.gz: 9e80ab5277dd3607978f6f5ccb23c95088f4dcaec7ecee4059a7649d071bc0c4451f6ece2f415c6900182a19b2e6abd5c8502b59876faa6cac66ec3eefee9eca
-  data.tar.gz: 0ce93e84a5ef74e07593193bcff94fec8d48687d0e9f976a2d289139ab7c74eb75c9e71811f696a5135eecc8836392ec56b95207982449ad8cd2ed8e19c89376
+  metadata.gz: 9de0e91ee02d6e0ecbe2efe6fdac3f116f45320ec54028e37c8404c62faf3a89ad7e0400c561624c69b3ada36150241b621004651658145a7985283bafdbf511
+  data.tar.gz: 15d0fbd7a02cd5fd5eeaca7a92353d3ef4a6b804d8e904613e75bc156d55efc2be702299facc216ae7dc96f08b502b93529ddf2097765c5fa821cb00d7dab8fe

data/Releases

@@ -1,5 +1,9 @@
 = Daemons Release History
 
+== Release 1.2.2: March 17, 2015
+
+* fix 100% CPU usage bug when using monitor mode.
+
 == Release 1.2.1: March 10, 2015
 
 * increase version number to be able to re-push to rubygems

data/lib/daemons/application.rb

@@ -152,8 +152,7 @@ module Daemons
       @pid.pid = Process.pid
 
       ENV['DAEMONS_ARGV'] = @controller_argv.join(' ')
-      # haven't tested yet if this is really passed to the exec'd process...
-
+      
       started
       Kernel.exec(script, *(@app_argv || []))
     end
@@ -215,7 +214,7 @@ module Daemons
       ARGV.concat @app_argv if @app_argv
 
       started
-      # TODO: begin - rescue - end around this and exception logging
+      # TODO: exception logging
       load script
     end
 
@@ -425,11 +424,11 @@ module Daemons
     end
 
     def zap
-      @pid.cleanup
+      @pid.zap
     end
 
     def zap!
-      begin; @pid.cleanup; rescue ::Exception; end
+      begin; @pid.zap; rescue ::Exception; end
     end
 
     def show_status

data/lib/daemons/application_group.rb

@@ -6,8 +6,6 @@ module Daemons
 
     attr_reader :monitor
 
-    # attr_reader :controller
-
     attr_reader :options
 
     attr_reader :applications
@@ -29,11 +27,8 @@ module Daemons
         @script = File.expand_path(options[:script])
       end
 
-      # @controller = controller
       @monitor = nil
 
-      # options = controller.options
-
       @multiple = options[:multiple] || false
 
       @dir_mode = options[:dir_mode] || :script
@@ -42,7 +37,6 @@ module Daemons
       @keep_pid_files = options[:keep_pid_files] || false
       @no_pidfiles = options[:no_pidfiles] || false
 
-      # @applications = find_applications(pidfile_dir())
       @applications = []
     end
 

data/lib/daemons/cmdline.rb

@@ -9,10 +9,6 @@ module Daemons
       @opts = OptionParser.new do |opts|
         opts.banner = ''
 
-#         opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
-#           @options[:verbose] = v
-#         end
-
         opts.on('-t', '--ontop', 'Stay on top (does not daemonize)') do |t|
           @options[:ontop] = t
         end
@@ -25,16 +21,11 @@ module Daemons
           @options[:no_wait] = t
         end
 
-        # opts.separator ""
-        # opts.separator "Specific options:"
-
         opts.separator ''
         opts.separator 'Common options:'
 
         # No argument, shows at tail.  This will print an options summary
         opts.on_tail('-h', '--help', 'Show this message') do
-          # puts opts
-          # @usage =
           controller.print_usage
 
           exit
@@ -62,15 +53,12 @@ END
       end
     end
 
-    #
     # Return a hash describing the options.
     #
     def parse(args)
       # The options specified on the command line will be collected in *options*.
       # We set default values here.
-      # options = {}
-
-      # #pp args
+      
       @opts.parse(args)
 
       @options

data/lib/daemons/controller.rb

@@ -38,7 +38,6 @@ module Daemons
     # Note that this function should only update <tt>@options</tt> and no other variables.
     #
     def setup_options
-      # @options[:ontop] ||= true
     end
 
     def run

data/lib/daemons/monitor.rb

@@ -49,14 +49,10 @@ module Daemons
             Process.detach(fork { a.start(restart = true) })
 
             sleep(5)
-
-            # application_group.setup
           end
         end
 
-        # sleep(5)
-        # application_group.setup
-        # sleep(30)
+        sleep(30)
       end
     end
     private :watch
@@ -67,21 +63,6 @@ module Daemons
 
         begin
           @pid.pid = Process.pid
-
-  #         at_exit {
-  # begin; @pid.cleanup; rescue ::Exception; end
-  #         }
-
-          # This part is needed to remove the pid-file if the application is killed by
-          # daemons or manually by the user.
-          # Note that the applications is not supposed to overwrite the signal handler for
-          # 'TERM'.
-          #
-  #         trap('TERM') {
-  # begin; @pid.cleanup; rescue ::Exception; end
-  #           exit
-  #         }
-
           watch(application_group)
         rescue ::Exception => e
           begin
@@ -124,13 +105,13 @@ module Daemons
             end
           end
       rescue ::Exception => e
-        puts "#{e} #{pid}"
+        puts "exception while trying to stop monitor process #{pid}: #{e}"
         puts 'deleting pid-file.'
       end
 
-      # We try to remove the pid-files by ourselves, in case the application
+      # We try to remove the pid-files by ourselves, in case the monitor
       # didn't clean it up.
-      begin; @pid.cleanup; rescue ::Exception; end
+      begin; @pid.zap; rescue ::Exception; end
     end
   end
 end

data/lib/daemons/pid.rb

@@ -18,8 +18,6 @@ module Daemons
         return false
       rescue ::Exception   # for example on EPERM (process exists but does not belong to us)
         return true
-      # rescue Errno::EPERM
-      #  return false
       end
     end
 
@@ -67,6 +65,10 @@ module Daemons
     # Cleanup method
     def cleanup
     end
+    
+    # Zap method
+    def zap
+    end
 
     # Exist? method
     def exist?

data/lib/daemons/pidfile.rb

@@ -99,11 +99,15 @@ module Daemons
       File.delete(filename) if pid == Process.pid
     end
 
+    def zap
+      File.delete(filename)
+    end
+    
     def pid
       begin
         File.open(filename) do |f|
           p = f.gets.to_i
-          return nil if p == 0 # Otherwise an invalid pid file becomes pid 0
+          return nil if p == 0  # Otherwise an invalid pid file becomes pid 0
           return p
         end
       rescue ::Exception

data/lib/daemons/version.rb

@@ -1,3 +1,3 @@
 module Daemons
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daemons
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Thomas Uehlinger