From 42f14de6ab50d0e05f49f038e40b94b686701bf1 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Wed, 15 Jun 2011 19:44:07 +0100 Subject: * Added Alert#subject to return source when subject unspecified * Added extra arg to acknowledge! * Alert#all_raised / all_cleared does not returned ack'd alerts * Added sanitising for source/subject * Catch empty alert_group notifications in AlertChanged * Tidied up alert_group * Added skip bytemark_auth when RACK_ENV is development * Tidied up logging in MauveThread, Timer, UdpServer * Added extra convenience methods to Time and Date * Moved working/daylight/dead_zone hours into Time --- lib/mauve/udp_server.rb | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'lib/mauve/udp_server.rb') diff --git a/lib/mauve/udp_server.rb b/lib/mauve/udp_server.rb index 9e5f41c..ba49bd4 100644 --- a/lib/mauve/udp_server.rb +++ b/lib/mauve/udp_server.rb @@ -18,19 +18,18 @@ module Mauve # # Set the logger up # - @logger = Log4r::Logger.new(self.class.to_s) @ip = "127.0.0.1" @port = 32741 @socket = nil @closing_now = false @sleep_interval = 0 end - + def open_socket @socket = UDPSocket.new @closing_now = false - @logger.debug("Trying to increase Socket::SO_RCVBUF to 10M.") + logger.debug("Trying to increase Socket::SO_RCVBUF to 10M.") old = @socket.getsockopt(Socket::SOL_SOCKET, Socket::SO_RCVBUF).unpack("i").first @socket.setsockopt(Socket::SOL_SOCKET, Socket::SO_RCVBUF, 10*1024*1024) @@ -38,11 +37,11 @@ module Mauve raise "Could not increase Socket::SO_RCVBUF. Had #{old} ended up with #{new}!" if old > new - @logger.debug("Successfully increased Socket::SO_RCVBUF from #{old} to #{new}.") + logger.debug("Successfully increased Socket::SO_RCVBUF from #{old} to #{new}.") @socket.bind(@ip, @port) - @logger.debug("Successfully opened UDP socket on #{@ip}:#{@port}") + logger.debug("Successfully opened UDP socket on #{@ip}:#{@port}") end def close_socket @@ -52,10 +51,10 @@ module Mauve @socket.close rescue IOError => ex # Just in case there is some sort of explosion! - @logger.debug("Caught IOError #{ex.to_s}") + logger.debug("Caught IOError #{ex.to_s}") end - @logger.debug("Successfully closed UDP socket") + logger.debug("Successfully closed UDP socket") end def main_loop @@ -81,7 +80,7 @@ module Mauve return if packet.nil? - @logger.debug("Got new packet: #{packet.inspect}") + logger.debug("Got new packet: #{packet.inspect}") # # If we get a zero length packet, and we've been flagged to stop, we stop! -- cgit v1.2.1