seapig-server 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3225ad7e10a412888e773d999c3891af4a69d12
-  data.tar.gz: a9dba35e923b127d8604245d2e70071eb76dc18e
+  metadata.gz: b8d1f455c52ec13b86faf4b292efdff4c3271af4
+  data.tar.gz: ad58fb2f509fd5f61e70e3d57380d550862cfc96
 SHA512:
-  metadata.gz: cfcc0da84581bf7c38e23e5f53ebffba31f3bf8f1fa4ba92d9050643c44f45adca72eeb7b46f3bafd507aabd867de0759b16af4641dd9b3f9e6750df4520ee72
-  data.tar.gz: 4b613077e54af4b556a9456d1df492f0dd80cf06eab0b33a13c9963d819db113e59d23fd7e53e2b1bb861dab1db7688c59d9114acd80ed4b4e23e8176a89e394
+  metadata.gz: ff1c37ef39bb2348c3722c510ded44ceac377393a57b1ed6e70d6c8fb23c727389ba2883b1b4eb1e871649784319e17b186a690d2aa9c6ae9dc653ccfefc27b6
+  data.tar.gz: 79a48ab267ec13b1dcd5661c361143e2b6178cd4b186129a9f37a576acb13b0a3963bd32272b524f814e82b2695dfc77ff514c81fc7ea05d0213f64bc44358d9

data/bin/seapig-server

@@ -65,8 +65,6 @@ end
 
 
 if OPTIONS["debug-memory"]
-	#require 'memory_profiler'
-	#MemoryProfiler.start
 	require 'objspace'
 	ObjectSpace.trace_object_allocations_start
 	$dump_heap = false
@@ -305,6 +303,8 @@ class SeapigObjectStore
 				}
 			end
 			enqueue(object)
+		else
+			client.object_destroy(id) if data != nil
 		end
 
 		if was_producing and not client.producing
@@ -863,11 +863,12 @@ class SeapigWebsocketClient
 	end
 
 
-	def destroy
-		puts "Client disconnected:\n        "+@index.to_s if DEBUG
+	def destroy(reason)
+		puts "Client %s disconnected: %s\n"%[id, reason.inspect] if DEBUG
 		@@clients_by_socket.delete(@socket)
 		@seapig_object_store.client_unregister(self, self)
 		@seapig_object_store.connection_unregister(self)
+		@socket.close
 	end
 
 
@@ -983,17 +984,17 @@ class SeapigWebsocketClient
 
 
 	def self.send_pings
-		@@clients_by_socket.keys.each { |socket| socket.ping }
+		@@clients_by_socket.keys.each { |client_socket| client_socket.ping }
 	end
 
 
 	def self.send_heartbeats
-		@@clients_by_socket.each_pair { |socket,client| socket.send Oj.dump('action' => 'heartbeat') if client.options['heartbeat'] }
+		@@clients_by_socket.each_pair { |client_socket, client| client_socket.send Oj.dump('action' => 'heartbeat') if client.options['heartbeat'] }
 	end
 
 
 	def self.check_ping_timeouts
-		@@clients_by_socket.each_pair { |socket,client| socket.close if Time.new - client.pong_time > 60 }
+		@@clients_by_socket.each_pair { |client_socket, client| SeapigWebsocketClient[client_socket].destroy("Ping timeout") if Time.new - client.pong_time > 60 }
 	end
 
 end
@@ -1035,8 +1036,8 @@ EM.run {
 	WebSocket::EventMachine::Server.start(host: HOST, port: PORT) { |client_socket|
 
 		client_socket.onmessage &safety_net { |message_json|
+			next if not client = SeapigWebsocketClient[client_socket]
 			started_at = Time.new
-			client = SeapigWebsocketClient[client_socket]
 			message = Oj.load message_json
 			puts "-"*80 + ' ' + Time.new.to_s if DEBUG
 			print "Message:\n        from: %-20s\n        action: %-30s\n        param: %-50s "%[client.id, message['action'], Oj.dump(message.select { |k,v| ['pattern','id','options'].include?(k) })] if DEBUG
@@ -1077,8 +1078,9 @@ EM.run {
 
 
 		client_socket.onopen &safety_net { SeapigWebsocketClient.new(seapig_object_store, client_socket) }
-		client_socket.onclose &safety_net { SeapigWebsocketClient[client_socket].destroy if SeapigWebsocketClient[client_socket] }
-		client_socket.onpong &safety_net { SeapigWebsocketClient[client_socket].pong }
+		client_socket.onclose &safety_net { SeapigWebsocketClient[client_socket].destroy("Connection closed") if SeapigWebsocketClient[client_socket] }
+		client_socket.onerror &safety_net { |error| SeapigWebsocketClient[client_socket].destroy(error) if SeapigWebsocketClient[client_socket] }
+		client_socket.onpong &safety_net { SeapigWebsocketClient[client_socket].pong if SeapigWebsocketClient[client_socket] }
 	}
 
 	puts "Listening on %s:%s"%[HOST,PORT] if INFO or DEBUG
@@ -1097,8 +1099,6 @@ EM.run {
 		if $dump_heap
 			$dump_heap = false
 			GC.start
-			#MemoryProfiler.stop.pretty_print(to_file: "memory_"+Time.new.strftime("%Y%m%d%H%M%S"))
-			#MemoryProfiler.start
 			open("heap_dump_"+Time.new.strftime("%Y%m%d%H%M%S"),"w") { |file| ObjectSpace.dump_all(output: file) }
 		end
 	})

data/lib/seapig-server/version.rb

@@ -1,3 +1,3 @@
 module SeapigServer
-	VERSION = "0.2.0"
+	VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seapig-server
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - yunta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-26 00:00:00.000000000 Z
+date: 2017-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-eventmachine-server
@@ -94,7 +94,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: meh
+description: Seapig is a master-slave object sharing system.
 email:
 - maciej.blomberg@mikoton.com
 executables: