lib/kafkr/log.rb in kafkr-0.5.7 vs lib/kafkr/log.rb in kafkr-0.9.1

@@ -72,11 +72,11 @@
         end
       end
     end
 
     def load_whitelist
-      whitelist = ["localhost", "::1","127.0.0.1"]
+      whitelist = ["localhost", "::1", "127.0.0.1"]
       if File.exist?("whitelist.txt")
         File.readlines("whitelist.txt").each do |line|
           ip = line.strip.sub(/^::ffff:/, "")
           whitelist << ip
         end
@@ -89,11 +89,22 @@
     end
 
     private
 
     def extract_uuid(message)
-      match_data = /^(\w{8}-\w{4}-\w{4}-\w{4}-\w{12}): (.+)$/.match(message)
-      match_data ? [match_data[1], match_data[2]] : [nil, nil]
+
+      #check if message if valid json
+      begin
+        message = JSON.parse(message)
+        
+        return message["uuid"], message
+
+      rescue JSON::ParserError => e
+        puts "Received invalid message format: #{message}"
+        match_data = /^(\w{8}-\w{4}-\w{4}-\w{4}-\w{12}): (.+)$/.match(message)
+        match_data ? [match_data[1], match_data[2]] : [nil, nil]
+      end
+      
     end
 
     def acknowledge_message(uuid, client)
       puts "Received message with UUID #{uuid}. Acknowledged."
       acknowledgment_message = "ACK: #{uuid}"