daemon_runner 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53c26321dab0ca599634cdf709c5fbed7f0d7567
-  data.tar.gz: 054a65b2f31eac817e24fa25d9ad068e516efa1a
+  metadata.gz: 9a40696f28e6af1d205de21719f33bcd617b3a6a
+  data.tar.gz: 72d29ef5129936ee5a64c0f159b32db2966f5a32
 SHA512:
-  metadata.gz: cca748f13e715c7170f77f6ccf83e91c0121e6352bb029f0bbf910d57f4d6d2a2f8dfbf7170d3d381f8aff3bc52ebbd7d685acd6036fe85ff94c781d08d7ffd1
-  data.tar.gz: 6b13b67488eb4704057eed3d715d456c80876aadad2fc2cb5dd60694da6f88d85eeefbbcedf5dca87f04b631f9c94ff19e0c2c1e41bb7bb180c37b5bae4f6795
+  metadata.gz: 05d11eb3122cd995603c1e21b0d66af72a467dfac4cf1a701e32260744eb09d6dc808a966a17547024d08d685ef5306a9391fc937bd906ffed6465ad1c4f0272
+  data.tar.gz: 0f2202f3091650a471edab3567a51fa7b1f76b9dd2f2147f701c38fc41f62625910e4be0ce7278d8350839e0d5ca29d2e82e9ee3958da188b426d33067395eff

data/lib/daemon_runner/client.rb

@@ -19,20 +19,20 @@ module DaemonRunner
         error_sleep_time = job[:error_sleep_time]
         on_error_release_lock = job[:on_error_release_lock]
         logger = job[:logger]
-        task_id = job[:task_id]
+        logger_name = job[:logger_name]
 
         mutex = @mutexes[task_id]
 
-        logger.error "#{task_id}: #{error}"
-        logger.debug "#{task_id}: #{error.backtrace.join("\n")}"
-        logger.debug "#{task_id}: Suspending #{task_id} for #{error_sleep_time} seconds"
+        logger.error "#{logger_name}: #{error}"
+        logger.debug "#{logger_name}: #{error.backtrace.join("\n")}"
+        logger.debug "#{logger_name}: Suspending #{logger_name} for #{error_sleep_time} seconds"
 
         # Unlock the job mutex if the job owns it and on_error_release_lock is true
         mutex.unlock if on_error_release_lock && mutex.owned?
 
         sleep error_sleep_time
 
-        logger.debug "#{task_id}: Resuming #{task_id}"
+        logger.debug "#{logger_name}: Resuming #{logger_name}"
       end
     end
 
@@ -148,6 +148,8 @@ module DaemonRunner
         out[:task_id] = "#{out[:class_name]}.#{out[:method]}"
       end
 
+      out[:logger_name] = "#{out[:class_name]}.#{out[:method]}"
+
       raise ArgumentError, 'Invalid task id' if out[:task_id].nil? || out[:task_id].empty?
 
       out[:args] = task[2..-1].flatten
@@ -188,9 +190,10 @@ module DaemonRunner
       method = parsed_task[:method]
       args = parsed_task[:args]
       task_id = parsed_task[:task_id]
+      logger_name = parsed_task[:logger_name]
 
       # Schedule the task
-      schedule_log_line = "#{task_id}: Scheduling job #{class_name}.#{method} as `:#{schedule[:type]}` type"
+      schedule_log_line = "#{logger_name}: Scheduling job #{class_name}.#{method} as `:#{schedule[:type]}` type"
       schedule_log_line += " with schedule: #{schedule[:schedule]}"
       logger.debug schedule_log_line
 
@@ -198,7 +201,7 @@ module DaemonRunner
       opts.merge!(schedule[:extra_opts]) if schedule.key?(:extra_opts)
 
       scheduler.send(schedule[:type], schedule[:schedule], opts) do |job|
-        log_line = "#{task_id}: Running #{class_name}.#{method}"
+        log_line = "#{logger_name}: Running #{class_name}.#{method}"
         log_line += "(#{args})" unless args.empty?
         logger.debug log_line
 
@@ -206,13 +209,14 @@ module DaemonRunner
         job[:on_error_release_lock] = on_error_release_lock
         job[:logger] = logger
         job[:task_id] = task_id
+        job[:logger_name] = logger_name
 
         out = if args.empty?
           instance.send(method.to_sym)
         else
           instance.send(method.to_sym, args)
         end
-        logger.debug "#{task_id}: Got: #{out}"
+        logger.debug "#{logger_name}: Got: #{out}"
       end
     end
 

data/lib/daemon_runner/shell_out.rb

@@ -94,7 +94,7 @@ module DaemonRunner
     # Setup a new Mixlib::ShellOut client runner
     # @return [Mixlib::ShellOut] client
     def runner
-      @runner ||= Mixlib::ShellOut.new(command, :cwd => cwd, :timeout => timeout)
+      @runner = Mixlib::ShellOut.new(command, :cwd => cwd, :timeout => timeout)
       @runner.valid_exit_codes = valid_exit_codes
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daemon_runner
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Andrew Thompson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2016-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logging