cn/dyndnsd
1
0
Fork 0
mirror of https://github.com/cmur2/dyndnsd.git synced 2024-12-21 14:54:22 +01:00
Code Releases Activity

Log more and add logfile config option

Browse Source
This commit is contained in:
cn 2013-04-27 22:02:54 +02:00
parent bde7b14e82
commit b477f4491e
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/dyndnsd.rb
View File

@ -89,6 +89,8 @@ module Dyndnsd
myip = params["myip"] myip = params["myip"]
Dyndnsd.logger.info "Request to update #{hostnames} to #{myip} for user #{user}"
changes = [] changes = []
hostnames.each do |hostname| hostnames.each do |hostname|
if (not @db['hosts'].include? hostname) or (@db['hosts'][hostname] != myip) if (not @db['hosts'].include? hostname) or (@db['hosts'][hostname] != myip)
@ -101,6 +103,7 @@ module Dyndnsd
if @db.changed? if @db.changed?
@db['serial'] += 1 @db['serial'] += 1
Dyndnsd.logger.info "Committing update ##{@db['serial']}"
@db.save @db.save
update update
end end
@ -109,9 +112,6 @@ module Dyndnsd
end end
def self.run! def self.run!
Dyndnsd.logger = Logger.new(STDOUT)
Dyndnsd.logger.formatter = LogFormatter.new
if ARGV.length != 1 if ARGV.length != 1
puts "Usage: dyndnsd config_file" puts "Usage: dyndnsd config_file"
exit 1 exit 1
@ -120,14 +120,25 @@ module Dyndnsd
config_file = ARGV[0] config_file = ARGV[0]
if not File.file?(config_file) if not File.file?(config_file)
Dyndnsd.logger.fatal "Config file not found!" puts "Config file not found!"
exit 1 exit 1
end end
Dyndnsd.logger.info "DynDNSd version #{Dyndnsd::VERSION}" puts "DynDNSd version #{Dyndnsd::VERSION}"
Dyndnsd.logger.info "Using config file #{config_file}" puts "Using config file #{config_file}"
config = YAML::load(File.open(config_file, 'r') { |f| f.read }) config = YAML::load(File.open(config_file, 'r') { |f| f.read })
if config['logfile']
Dyndnsd.logger = Logger.new(config['logfile'])
else
Dyndnsd.logger = Logger.new(STDOUT)
end
Dyndnsd.logger.progname = "dyndnsd"
Dyndnsd.logger.formatter = LogFormatter.new
Dyndnsd.logger.info "Starting..."
db = Database.new(config['db']) db = Database.new(config['db'])
updater = Updater::CommandWithBindZone.new(config['domain'], config['updater']['params']) if config['updater']['name'] == 'command_with_bind_zone' updater = Updater::CommandWithBindZone.new(config['domain'], config['updater']['params']) if config['updater']['name'] == 'command_with_bind_zone'
@ -135,10 +146,13 @@ module Dyndnsd
app = Daemon.new(config, db, updater, responder) app = Daemon.new(config, db, updater, responder)
app = Rack::Auth::Basic.new(app, "DynDNS") do |user,pass| app = Rack::Auth::Basic.new(app, "DynDNS") do |user,pass|
(config['users'].has_key? user) and (config['users'][user]['password'] == pass) allow = (config['users'].has_key? user) and (config['users'][user]['password'] == pass)
Dyndnsd.logger.warn "Login failed for #{user}" if not allow
allow
end end
Signal.trap('INT') do Signal.trap('INT') do
Dyndnsd.logger.info "Quitting..."
Rack::Handler::WEBrick.shutdown Rack::Handler::WEBrick.shutdown
end end