mamiya 0.0.1.alpha22 → 0.0.1.alpha23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 132e823632be17c5738d084b0c0137d92846408f
-  data.tar.gz: 19a669e42c52946e603884bf9a27816e7b22bbf7
+  metadata.gz: 46e8f4b3cd898fb6448e6cd4d5e8161c2fac101b
+  data.tar.gz: d921dadc048b7bfc587ec71a25d2cf14323dbe53
 SHA512:
-  metadata.gz: d1ad837469c4bf7ddbeb9bb2d740070e9705344df425c2047b8f9ccec4e3a0a75626533f19f7b7a189407f147be538d7b628d884633bf68c5f969f2773df20c2
-  data.tar.gz: 80e843665be039f845917ce97bc9c47bced11d2f147096868617d6c0d0306e407e600a95516dbab64a4e08ad3cd976358dd11df75939baa4a6297e8aa594113a
+  metadata.gz: d1169ca11bfc342862c8fc46fff5e91423a4d06ef2cab4f80b36275129e4b8f12047719b0459fc513d0e6091d1f43ccaa22834f9fa88ae0696a91e44e53268fc
+  data.tar.gz: b4906b0a1110d80ac1e82f7fecdbe22fc4b782203fdfcb83840cf3ecca4a3126334f02159e3966d93984e06ae556b0afb6c41dddb3786b9af603c924b74d986b

data/lib/mamiya/agent.rb

@@ -18,6 +18,8 @@ require 'mamiya/agent/tasks/clean'
 require 'mamiya/agent/handlers/task'
 require 'mamiya/agent/actions'
 
+require 'sigdump/setup' unless ENV['DISABLE_SIGDUMP'] == '1'
+
 module Mamiya
   class Agent
     include Mamiya::Agent::Actions
@@ -205,8 +207,10 @@ module Mamiya
 
       class_name = type.capitalize.gsub(/-./) { |_| _[1].upcase }
 
-      logger.debug "Received user event #{type}"
-      logger.debug payload.inspect
+      if config.debug_all_events
+        logger.debug "Received user event #{type}"
+        logger.debug payload.inspect
+      end
 
       if Handlers.const_defined?(class_name)
         handler = Handlers.const_get(class_name).new(self, event)

data/lib/mamiya/agent/task_queue.rb

@@ -18,7 +18,7 @@ module Mamiya
         @queueing_thread = nil
         @lifecycle_mutex = Mutex.new
         @terminate = false
-        @logger = logger['task_queue']
+        @logger = logger.with_clean_progname['task_queue']
       end
 
       attr_reader :worker_threads, :task_classes, :agent
@@ -118,7 +118,8 @@ module Mamiya
               status[:pending].delete task
               status[:working] = task
             end
-            task_class.new(self, task, agent: @agent, logger: @logger).execute
+            task_logger = @logger.with_clean_progname
+            task_class.new(self, task, agent: @agent, logger: task_logger).execute
           rescue Exception => e
             @logger.error "#{task_class} worker catched error: #{e}\n\t#{e.backtrace.join("\n\t")}"
           ensure

data/lib/mamiya/cli/client.rb

@@ -133,7 +133,7 @@ not distributed: #{dist['not_distributed_count']} agents
         params = options[:labels] ?
           {labels: Mamiya::Util::LabelMatcher.parse_string_expr(options[:labels])} : {}
 
-        p master_post("/packages/#{application}/#{package}/distribute", params, type: :json)
+        p master_post("/packages/#{application}/#{package}/distribute", params.merge(type: :json))
       end
 
       desc "prepare PACKAGE", "order preparing package to agents"
@@ -142,7 +142,7 @@ not distributed: #{dist['not_distributed_count']} agents
         params = options[:labels] ?
           {labels: Mamiya::Util::LabelMatcher.parse_string_expr(options[:labels])} : {}
 
-        p master_post("/packages/#{application}/#{package}/prepare", params, type: :json)
+        p master_post("/packages/#{application}/#{package}/prepare", params.merge(type: :json))
       end
 
       desc "refresh", "order refreshing agent status"
@@ -181,17 +181,17 @@ not distributed: #{dist['not_distributed_count']} agents
         end
       end
 
-      def master_post(path, data='', type: :text)
+      def master_post(path, data='')
         response = nil
         master_http.start do |http|
           headers = {}
 
           if Hash === data
-            case type
+            case data.delete(:type) || :query
             when :json
               data = data.to_json
               headers['Content-Type'] = 'application/json'
-            when :text
+            when :query
               data = Rack::Utils.build_nested_query(data)
             end
           end

data/lib/mamiya/configuration.rb

@@ -8,7 +8,9 @@ module Mamiya
     # common
     set_default :serf, {}
     set_default :storage, {}
+
     set_default :show_backtrace_in_fatal, true
+    set_default :debug_all_events, false
 
     set_default :application, nil
 

data/lib/mamiya/logger.rb

@@ -55,11 +55,21 @@ module Mamiya
       @logdev.remove_output(*outputs)
     end
 
+    def with_clean_progname
+      self.dup.tap do |new|
+        new.progname = nil
+      end
+    end
+
     def [](progname)
       self.dup.tap do |new_logger|
         new_logger.instance_eval do
           @logger = @logger.dup
-          @logger.progname = progname
+          if @logger.progname && !@logger.progname.empty?
+            @logger.progname += "/#{progname}"
+          else
+            @logger.progname = progname
+          end
         end
       end
     end

data/lib/mamiya/master/agent_monitor.rb

@@ -181,7 +181,7 @@ module Mamiya
       private
 
       def logger
-        @logger ||= @master.logger['agent-monitor']
+        @logger ||= @master.logger.with_clean_progname['agent-monitor']
       end
     end
   end

data/lib/mamiya/script.rb

@@ -56,7 +56,9 @@ module Mamiya
     def run(*args, allow_failure: false)
       # TODO: Stop when fail
       actual = -> do
-        logger = self.logger['RUN']
+        started_at = Time.now
+        run_id = generate_run_id()
+        logger = self.logger["run:#{run_id}"]
 
         logger.info("$ #{args.shelljoin}")
 
@@ -68,18 +70,32 @@ module Mamiya
         [out_w, err_w].each(&:close)
 
         buf = ""
+        last_out = Time.now
 
-        ths = {:debug => out_r, :warn => err_r}.map do |severity, io|
+        ths = {:info => out_r, :warn => err_r}.map do |severity, io|
           Thread.new {
             until io.eof?
               str = io.gets
               logger.__send__(severity, str.chomp)
               buf << str
+              last_out = Time.now
             end
           }.tap { |_| _.abort_on_exception = true }
         end
 
+        timekeeper_th = Thread.new do
+          l = logger['timekeeper']
+          loop do
+            if 90 < (Time.now - last_out)
+              l.warn "pid #{pid} still running; since #{started_at}"
+            end
+            sleep 60
+          end
+        end
+        timekeeper_th.abort_on_exception = true
+
         pid, status = Process.waitpid2(pid)
+        timekeeper_th.kill if timekeeper_th.alive?
 
         begin
           timeout(3) { ths.each(&:join) }
@@ -90,15 +106,20 @@ module Mamiya
         [out_r, err_r].each(&:close)
 
         unless allow_failure || status.success?
-          raise CommandFailed,
-            "Excecution failed (" \
+          failure_msg = "Execution failed (" \
             "status=#{status.exitstatus}" \
             " pid=#{status.pid}" \
             "#{status.signaled? ? "termsig=#{status.termsig.inspect} stopsig=#{status.stopsig.inspect}" : nil}" \
             "#{status.stopped? ? " stopped" : nil}" \
             "): #{args.inspect}"
+
+          logger.error failure_msg
+          raise CommandFailed, failure_msg
+
         end
 
+        logger.info "pid #{pid} completed: #{args.inspect}"
+
         buf
       end
 
@@ -133,5 +154,28 @@ module Mamiya
     def current_path
       deploy_to && deploy_to.join('current')
     end
+
+    private
+
+    RUN_ID_BASE_TIME = Time.new(2014,01,01,0,0,0).to_i
+    def generate_run_id
+      (@run_id_mutex ||= Mutex.new).synchronize do
+        t = Time.now.to_i
+        id = (t - RUN_ID_BASE_TIME).to_i.to_s(36)
+
+        @last_run_id_time ||= 0
+        if (t - @last_run_id_time) < 1
+          @run_id_seq ||= 0
+          @run_id_seq += 1
+          id << @run_id_seq.to_s(36)
+        else
+          @run_id_seq = nil
+          id << '0'
+        end
+
+        @last_run_id_time = t
+        id
+      end
+    end
   end
 end

data/lib/mamiya/steps/switch.rb

@@ -10,6 +10,7 @@ module Mamiya
         script.before_switch(labels)[]
 
         # TODO: link with relative if available?
+        # TODO: Restore this if FAILED
         File.unlink script.current_path if script.current_path.symlink?
         script.current_path.make_symlink(target.realpath)
 

data/lib/mamiya/version.rb

@@ -1,3 +1,3 @@
 module Mamiya
-  VERSION = "0.0.1.alpha22"
+  VERSION = "0.0.1.alpha23"
 end

data/mamiya.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   end
 
   spec.add_runtime_dependency "sinatra", ">= 1.4.5"
+  spec.add_runtime_dependency "sigdump"
 
   spec.add_development_dependency "rspec", "2.14.1"
   spec.add_development_dependency 'rack-test', '~> 0.6.2'

data/spec/script_spec.rb

@@ -15,7 +15,7 @@ describe Mamiya::Script do
   let(:logger) {
     double("logger").tap do |_|
       _.stub(:[]) { _ }
-      %i(info warn debug).each do |severity|
+      %i(info warn debug error).each do |severity|
         _.stub(severity) { |*args| log << [severity, *args]; _ }
       end
     end
@@ -38,6 +38,14 @@ describe Mamiya::Script do
     end
 
     context "when the command failed" do
+      it "logs error" do
+        begin
+          script.run("false")
+        rescue Mamiya::Script::CommandFailed
+        end
+        expect(log.map(&:first)).to include(:error)
+      end
+
       it "raises error" do
         expect {
           script.run("false")
@@ -53,15 +61,14 @@ describe Mamiya::Script do
       end
     end
 
-
     it "logs command as information" do
       script.run("echo", "foo", "bar'", " baz")
       expect(log).to include([:info, "$ echo foo bar\\' \\ baz"])
     end
 
-    it "logs stdout as debug" do
+    it "logs stdout as info" do
       script.run("echo", "foo")
-      expect(log).to include([:debug, "foo"])
+      expect(log).to include([:info, "foo"])
     end
 
     it "logs stderr as warn" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mamiya
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha22
+  version: 0.0.1.alpha23
 platform: ruby
 authors:
 - Shota Fukumori (sora_h)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-09 00:00:00.000000000 Z
+date: 2014-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.5
+- !ruby/object:Gem::Dependency
+  name: sigdump
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement