seapig-server 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b946a0834e2eba8cd49a00ceec8e851c757955f6
-  data.tar.gz: 5466488806f71b47122e604224f7f8ca8d560963
+  metadata.gz: 0c8d5a4a1af89805ec7bc0969ee5901724a36898
+  data.tar.gz: 1f0e34780c4eae224e13e940ca9a7f3113c46f98
 SHA512:
-  metadata.gz: 5d0378f7d671db57df6366d5e1f58051a45fa7eeacda6aa9c222dde0a337c7e6d363d38d65d7a3c95d03f99258b9cbfa9091cc53c806c7071f79ae21b5ad0217
-  data.tar.gz: 34de72650fad7d8b8476757927c40abe2b8f79ba130035c2a07c3aa316f33cb7464edd97eb06da12379c9db2a294d1a53dac1babb4fc26446a1919404ef87a6c
+  metadata.gz: 49aae39196e5eee0da10cab70517b9e07277018dbe15142fe34a7a775b5aa4065869cbe53c910e3262ebe4dab564aa13ed97ae22d55c5546f1f23356286f63dc
+  data.tar.gz: d97c5d559b848c0dbfdb9d778a8fefed8c2bb4f61546137194232a79433c469f2b8649af288206392b1ca26074e2c0212025d9439e3ae47305fe41e905ba3b15

data/bin/seapig-server

@@ -1,4 +1,5 @@
 #!/bin/env ruby
+# coding: utf-8
 
 require 'websocket-eventmachine-server'
 require 'json'
@@ -73,13 +74,13 @@ class SeapigObject
 				client.socket.send JSON.dump(action: 'object-destroy', id: id)
 			}
 			puts "Deleting: "+id
-			@@objects_by_id.delete(id) 
+			@@objects_by_id.delete(id)
 		}
 	end
 
 
 	def patch(patch, value, from_version, new_version)
-		print "Patching:\n        version:"+@version.inspect+"\n        from_version: "+from_version.inspect+"\n        new_version: "+new_version.inspect+"\n        patch_size: "+(patch and patch.size.to_s or "nil")+"\n        --> "  
+		print "Patching:\n        version:"+@version.inspect+"\n        from_version: "+from_version.inspect+"\n        new_version: "+new_version.inspect+"\n        patch_size: "+(patch and patch.size.to_s or "nil")+"\n        --> "  
 		if from_version == @version or from_version == 0
 			puts 'clean'
 			if value and @stall_after
@@ -242,6 +243,12 @@ class Client
 	def check_ping_timeout
 		@socket.close if Time.new - pong > 60
 	end
+
+
+	def send_heartbeat
+		@socket.send JSON.dump(action: 'heartbeat') if @options['heartbeat']
+	end
+
 end
 
 
@@ -303,17 +310,8 @@ EM.run {
 
         Socket.open(:UNIX, :DGRAM)  { |s| s.connect(Socket.pack_sockaddr_un(ENV['NOTIFY_SOCKET'])); s.sendmsg "READY=1" } if ENV['NOTIFY_SOCKET']
 	
-	EM.add_periodic_timer(10) {
-		Client.all.each { |client|
-			client.ping
-		}
-	}
-
-
-	EM.add_periodic_timer(10) {
-		Client.all.each { |client|
-			client.check_ping_timeout 
-		}
-	}
+	EM.add_periodic_timer(10) { Client.all.each { |client|	client.ping  } }
+	EM.add_periodic_timer(10) { Client.all.each { |client|	client.check_ping_timeout  } }
+	EM.add_periodic_timer(10) { Client.all.each { |client|	client.send_heartbeat  } }
 	
 }

data/lib/seapig/version.rb

@@ -1,3 +1,3 @@
 module Seapig
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seapig-server
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - yunta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-12 00:00:00.000000000 Z
+date: 2016-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-eventmachine-server