Project

General

Profile

« Previous | Next » 

Revision 05b96b99

Added by Guido Günther almost 8 years ago

Fixes #15944 - Make it obvious that messages come from DHCP

The occasional log reader might not know if this refers to a DNS or
DHCP 'record'.

Capitalize DHCP consistently.

View differences:

modules/dhcp_common/server.rb
service.find_lease_by_mac(subnet.network, mac_address)
if r && subnet.valid_range(:from => from_address, :to => to_address).include?(r.ip)
logger.debug "Found an existing dhcp record #{r}, reusing..."
logger.debug "Found an existing DHCP record #{r}, reusing..."
return r.ip
end
end
......
logger.debug "We already got the same DHCP record - skipping"
raise Proxy::DHCP::AlreadyExists
else
logger.warn "Request to create a conflicting record"
logger.warn "Request to create a conflicting DHCP record"
logger.debug "request: #{options.inspect}"
logger.debug "local: #{record.options.inspect}"
raise Proxy::DHCP::Collision, "Record #{net}/#{ip} already exists"
raise Proxy::DHCP::Collision, "DHCP record #{net}/#{ip} already exists"
end
end

Also available in: Unified diff