mamiya 0.0.1.alpha6 → 0.0.1.alpha7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0f7a6c651243bbb6688a23b99f6a227b9f43100
-  data.tar.gz: db21e18cb16baad91bb16fef86b5c764d8f395b4
+  metadata.gz: c740e295861a9dc89bd72f70e1f693136306783a
+  data.tar.gz: 4ee69a07bdb07d69a945e150c6a45775c9cc451e
 SHA512:
-  metadata.gz: 228af2b0c3e35452f515868590cde85131b79818a0b0e2c174a23e89adad56cd9ae03d3fb30aef16fbb0656dbfd581ad4b4113bc00c3dcca2d656605f8c95236
-  data.tar.gz: 7eb0f6684de2155783e43ed516217fc5743ebdb01b708e0dc30e32e01fad6f777ae82c49a72f086ad5c29d1501190741f77d97947519fc660830e1eb3b483e72
+  metadata.gz: 71de35f8913cf2e1dc0af2ed38210cfe0524c8c4c5af7ae3bd7ec1ff974ea57d5aedfccaa86d8307aa9ec157b09e904b1566463c59db41eeae01ff4ad84d604d
+  data.tar.gz: fee51b6ef754f2770ff03edf07a37f4c0a015015d167143c1d0be27f3e24df03a049246427e1d65740f022be371d084476c4bf5f4a12ee024255eaba52cceef1

data/lib/mamiya/cli/client.rb

@@ -2,6 +2,7 @@ require 'mamiya/cli'
 
 require 'net/http'
 require 'net/https'
+require 'rack/utils'
 require 'uri'
 require 'json'
 require 'thor'
@@ -128,6 +129,11 @@ number of agents don't have package: #{dist['not_distributed_count']}
       def rollback
       end
 
+      desc "join HOST", "let serf to join to HOST"
+      def join(host)
+        master_post('/join', host: host)
+      end
+
       private
 
       def fatal!(msg)
@@ -146,10 +152,19 @@ number of agents don't have package: #{dist['not_distributed_count']}
       end
 
       def master_post(path, data='')
+        response = nil
         master_http.start do |http|
-          response = http.post(path, data).tap(&:value)
-          response.code == '204' ? true : JSON.parse(response.tap(&:value).body)
+          if Hash === data
+            data = Rack::Utils.build_nested_query(data)
+          end
+
+          response = http.post(path, data)
+          response.value
+          response.code == '204' ? true : JSON.parse(response.body)
         end
+      rescue Net::HTTPExceptions => e
+        puts response.body rescue nil
+        raise e
       end
 
       def master_http

data/lib/mamiya/master/web.rb

@@ -143,6 +143,19 @@ module Mamiya
         agent_monitor.refresh
         status 204
       end
+
+      post '/join' do
+        begin
+          master.serf.join(params[:host])
+          status 204
+        rescue Villein::Client::SerfError => e
+          raise e unless /Error joining the cluster/ === e.message
+
+          content_type :json
+          status 400
+          {error: e.message}.to_json
+        end
+      end
     end
   end
 end

data/lib/mamiya/version.rb

@@ -1,3 +1,3 @@
 module Mamiya
-  VERSION = "0.0.1.alpha6"
+  VERSION = "0.0.1.alpha7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mamiya
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha6
+  version: 0.0.1.alpha7
 platform: ruby
 authors:
 - Shota Fukumori (sora_h)