MEChat 1.2.5 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 970e7269319bf1254409794849e9a886384b0ac615c58732413cfb0fbaffdb26
-  data.tar.gz: 6fbe3b25ef02df8ddd82a5d3de0c49eba494468212d6bffdeb33f3c3e2288575
+  metadata.gz: 7b0b0a773c231d57e3171ecf0470e072ff4f73822843033d6be17e3aa6964f8b
+  data.tar.gz: a85c124600569228418a949b486bf7eaf43d3aa4601f70e07ce3edace33b4c32
 SHA512:
-  metadata.gz: ffedf600eedfa4bed9334fbafae153135bc288869f1b349598c704c9ca8f166d3992e2581fa8184a5f3280ab5a114114e9fecbafbc74409ac34a7ee2cd1f339e
-  data.tar.gz: 1c596f8b598b325f42afbecf91528d3dcfe9779398722c09e38242c9d44a4c9391fd36e05d1989e241917aac66059e403a77a50bb2c80269433864efef0fb9ea
+  metadata.gz: 88b6ba28024f7cdce8498be9de5cbff2f49f070a65f98ec5300860aa4bb063efdb35db2c0087416fe9315bdfdc4cde0616a41645351685dd3c35fbc5743ee9f9
+  data.tar.gz: e42a3ad6645f6bd32c24c44d63d76f414e6e02cdc353e3e0a06e354894c12e405c2e15484ff559e4994ee088860980ffa0e46f5e477bb8b67fc782e57b74bb5b

data/Chat.rb

@@ -36,7 +36,7 @@ class Chat < DistributedChat::ChatService::Service
   def request_critical_section(req,_call)
     request = {:ip => Addrinfo.getaddrinfo(req.username.split(":")[0..-2].join(":"),req.username.split(":")[-1].to_i)[0], :message => req}
     if $crit_section === 0
-      @logger.info "Sent reply to #{request[:ip].ip_address}:#{request[:ip].ip_port}, because I am not in critical section | #{_call}"
+      @logger.info "Sent reply to #{request[:ip].ip_address}:#{request[:ip].ip_port}, because I am not in critical section"
       send_reply ip: request[:ip]
     elsif $crit_section < 2 && request[:message].timestamp < $alg.clock
       @logger.info "Sent reply to #{request[:ip].ip_address}:#{request[:ip].ip_port}, because I am entering critical section but my request is newer"

data/NodeDiscovery.rb

@@ -61,6 +61,13 @@ class NodeDiscoveryImpl < DistributedChat::NodeDiscovery::Service
     NodeInfoEnum.new($nodes).each
   end
 
+  def deregister_node(node_info, _call)
+    $nodes.reject! { |x| x.address === node_info.address && x.port === node_info.port }
+    @logger.info "Deregistered node with ip:" + node_info.address + ":" + node_info.port.to_s
+    puts node_info.address + ":" + node_info.port.to_s + " left network"
+    DistributedChat::Response.new status_code: 0
+  end
+
   def get_nodes_local
     $nodes
   end

data/client.rb

@@ -68,21 +68,33 @@ class Client
   def run
     new_msg = gets.chomp
     while new_msg != "exit"
-    $crit_section = 1
-    request_critical_section
-    while $alg.replies.length < $nodes.length
-      sleep 0.1
+      $crit_section = 1
+      request_critical_section
+      while $alg.replies.length < $nodes.length
+        sleep 0.1
+      end
+      $crit_section = 2
+      # gets
+      $nodes.each do |node|
+        chat = DistributedChat::ChatService::Stub.new("#{node.address}:#{node.port}", :this_channel_is_insecure)
+        chat.send_message(DistributedChat::Request.new(username: "#{@ip.ip_address}:#{$port.to_s}", message: new_msg, timestamp: $alg.clock))
+        @logger.info "Sent message \"#{new_msg}\" to #{node.address}:#{node.port}"
+      end
+      $messages.push DistributedChat::Request.new(username: "#{@ip.ip_address}:#{$port.to_s}", message: new_msg, timestamp: $alg.clock)
+      release_critical_section
+      $crit_section = 0
+      new_msg = gets.chomp
     end
-    $crit_section = 2
     $nodes.each do |node|
-      chat = DistributedChat::ChatService::Stub.new("#{node.address}:#{node.port}", :this_channel_is_insecure)
-      chat.send_message(DistributedChat::Request.new(username: "#{@ip.ip_address}:#{$port.to_s}", message: new_msg, timestamp: $alg.clock))
-      @logger.info "Sent message \"#{new_msg}\" to #{node.address}:#{node.port}"
-    end
-    $messages.push DistributedChat::Request.new(username: "#{@ip.ip_address}:#{$port.to_s}", message: new_msg, timestamp: $alg.clock)
-    release_critical_section
-    $crit_section = 0
-    new_msg = gets.chomp
+      begin
+        nodediscovery = DistributedChat::NodeDiscovery::Stub.new("#{node.address}:#{node.port}", :this_channel_is_insecure)
+        nodediscovery.deregister_node(DistributedChat::NodeInfo.new(address: @ip.ip_address, port: $port))
+      rescue GRPC::Unavailable
+
+      end
     end
+    @logger.info "Disconnected from network"
+    puts "Disconnected from network"
+    $finished = true
   end
 end

data/lib/MEChat_pb.rb

@@ -5,7 +5,7 @@
 require 'google/protobuf'
 
 
-descriptor_data = "\n\x0cMEChat.proto\x12\x10\x64istributed_chat\"?\n\x07Request\x12\x10\n\x08username\x18\x01 \x01(\t\x12\x0f\n\x07message\x18\x02 \x01(\t\x12\x11\n\ttimestamp\x18\x03 \x01(\x05\"\x1f\n\x08Response\x12\x13\n\x0bstatus_code\x18\x01 \x01(\x05\"O\n\x08NodeInfo\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x0c\n\x04port\x18\x02 \x01(\x05\x12\x16\n\ttimestamp\x18\x03 \x01(\x05H\x00\x88\x01\x01\x42\x0c\n\n_timestamp2\xf5\x01\n\x0b\x43hatService\x12\x44\n\x0bSendMessage\x12\x19.distributed_chat.Request\x1a\x1a.distributed_chat.Response\x12O\n\x16RequestCriticalSection\x12\x19.distributed_chat.Request\x1a\x1a.distributed_chat.Response\x12O\n\x16ReleaseCriticalSection\x12\x19.distributed_chat.Request\x1a\x1a.distributed_chat.Response2\x9e\x01\n\rNodeDiscovery\x12H\n\x0cRegisterNode\x12\x1a.distributed_chat.NodeInfo\x1a\x1a.distributed_chat.NodeInfo0\x01\x12\x43\n\x08GetNodes\x12\x19.distributed_chat.Request\x1a\x1a.distributed_chat.NodeInfo0\x01\x42\t\xaa\x02\x06MEChatb\x06proto3"
+descriptor_data = "\n\x0cMEChat.proto\x12\x10\x64istributed_chat\"?\n\x07Request\x12\x10\n\x08username\x18\x01 \x01(\t\x12\x0f\n\x07message\x18\x02 \x01(\t\x12\x11\n\ttimestamp\x18\x03 \x01(\x05\"\x1f\n\x08Response\x12\x13\n\x0bstatus_code\x18\x01 \x01(\x05\"O\n\x08NodeInfo\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x0c\n\x04port\x18\x02 \x01(\x05\x12\x16\n\ttimestamp\x18\x03 \x01(\x05H\x00\x88\x01\x01\x42\x0c\n\n_timestamp2\xf5\x01\n\x0b\x43hatService\x12\x44\n\x0bSendMessage\x12\x19.distributed_chat.Request\x1a\x1a.distributed_chat.Response\x12O\n\x16RequestCriticalSection\x12\x19.distributed_chat.Request\x1a\x1a.distributed_chat.Response\x12O\n\x16ReleaseCriticalSection\x12\x19.distributed_chat.Request\x1a\x1a.distributed_chat.Response2\xe8\x01\n\rNodeDiscovery\x12H\n\x0cRegisterNode\x12\x1a.distributed_chat.NodeInfo\x1a\x1a.distributed_chat.NodeInfo0\x01\x12\x43\n\x08GetNodes\x12\x19.distributed_chat.Request\x1a\x1a.distributed_chat.NodeInfo0\x01\x12H\n\x0e\x44\x65registerNode\x12\x1a.distributed_chat.NodeInfo\x1a\x1a.distributed_chat.ResponseB\t\xaa\x02\x06MEChatb\x06proto3"
 
 pool = Google::Protobuf::DescriptorPool.generated_pool
 

data/lib/MEChat_services_pb.rb

@@ -36,6 +36,7 @@ module DistributedChat
 
       rpc :RegisterNode, ::DistributedChat::NodeInfo, stream(::DistributedChat::NodeInfo)
       rpc :GetNodes, ::DistributedChat::Request, stream(::DistributedChat::NodeInfo)
+      rpc :DeregisterNode, ::DistributedChat::NodeInfo, ::DistributedChat::Response
     end
 
     Stub = Service.rpc_stub_class

data/main.rb

@@ -15,6 +15,7 @@ $nodes = []
 $messages = []
 $crit_section = 0
 $alg = RicartAgrawala.new
+$finished = false
 
 class Main
 
@@ -53,6 +54,14 @@ class Main
     end
     server.join
     client.join
+    checker = Thread.new do
+      until $finished
+        sleep 1
+      end
+      puts "Shutting down"
+      client.kill
+      server.kill
+    end
+    checker.join
   end
-
 end

data/server.rb

@@ -26,9 +26,7 @@ class Server
     server.handle(chat)
     puts "Server side running on " + $port.to_s
 
-    server.run_till_terminated_or_interrupted(['int', 'SIGTERM'])
+    server.run_till_terminated_or_interrupted(['int', 'SIGTERM', 'TERM', 'SIGINT'])
 
   end
 end
-
-# Server.new.run

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: MEChat
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.5.0
 platform: ruby
 authors:
 - Lukas Kaufmann