dns_one.rb in dns_one-0.4.24

- old
+ new
@@ -1,109 +1,100 @@
 # Core
 require 'syslog'
 require 'syslog/logger'
 require 'ostruct'
-require 'yaml'
 require 'singleton'
 
 # Gems
 require 'rexec'
 require 'rubydns'
+require 'yaml'
 
 # DnsOne
 
 require "dns_one/core_ext/exception"
 require "dns_one/core_ext/string"
 require "dns_one/core_ext/blank"
+require "dns_one/core_ext/hash"
 
 require "dns_one/log"
 require "dns_one/util"
-
 require "dns_one/server"
-require "dns_one/setup"
-require "dns_one/cache"
-require "dns_one/zone_search"
 
-require 'dns_one/backend/file'
-require 'dns_one/backend/db'
-
 module DnsOne; class DnsOne
 
-	DEFAULT_LOG_FILE = "/var/log/dns_one.log"
-	DEFAULT_CONF_FILE = '/etc/dns_one/conf.yml'
-	WORK_DIR = "/var/local/dns_one"
+    DEFAULT_LOG_FILE = "/var/log/dns_one.log"
+    DEFAULT_CONF_FILE = '/etc/dns_one/conf.yml'
+    WORK_DIR = "/var/local/dns_one"
+    CONF_DIR = "/etc/dns_one"
+    SYSLOG_NAME = 'dns_one'
 
-	CONF_DIR = "/etc/dns_one"
-	SYSLOG_NAME = 'dns_one'
+    def initialize conf_file: nil, log_file: nil, work_dir: nil
+        cmd_log_file = log_file
+        log_file ||= DEFAULT_LOG_FILE
+        Log.setup log_file, SYSLOG_NAME
 
-	def initialize conf_file: nil, log_file: nil, work_dir: nil
-		cmd_log_file = log_file
-		log_file ||= DEFAULT_LOG_FILE
-		Log.setup log_file, SYSLOG_NAME
+        conf_file ||= DEFAULT_CONF_FILE
+        @conf_all = parse_conf conf_file
+        @conf = @conf_all.main
 
-		conf_file ||= DEFAULT_CONF_FILE
-		@conf_all = parse_conf conf_file
-		@conf = @conf_all.main
+        work_dir ||= WORK_DIR
 
-		work_dir ||= WORK_DIR
+        # Redefine log file if set in conf file
+        unless cmd_log_file
+            if f = @conf[:log_file].presence 
+                unless Log.change_log_file f
+                    Log.w "Unable to change logfile to #{f}. Will continue with #{Log.log_file_desc}."
+                end
+            end
+        end
 
-		# Redefine log file if set in conf file
-		unless cmd_log_file
-			if f = @conf[:log_file].presence 
-				unless Log.change_log_file f
-					Log.w "Unable to change logfile to #{f}. Will continue with #{Log.log_file_desc}."
-				end
-			end
-		end
+        begin
+            Dir.chdir work_dir
+        rescue => e
+            Log.w "Cannot change working dir to #{WORK_DIR}. Will continue in #{Dir.pwd}."
+        end
+    end
 
-		begin
-			Dir.chdir work_dir
-		rescue => e
-			Log.w "Cannot change working dir to #{WORK_DIR}. Will continue in #{Dir.pwd}."
-		end
-	end
+    def start
+        Server.new(@conf_all.server, @conf_all.zone_search).run 
+    end
 
-	def start
-		Server.new(@conf_all.server, @conf_all.zone_search).run 
-	end
+    private
+        
+    def parse_conf conf_file
+        check_conf_file conf_file
 
-	private
-def symbolize_keys(hash)
-  hash.each_with_object({}) { |(k, v), h| h[k.to_sym] = v.is_a?(Hash) ? symbolize_keys(v) : v }
-end
-	def parse_conf conf_file
-		check_conf_file conf_file
+        conf = YAML.load_file conf_file
+        conf = conf.symbolize_keys
 
-		conf = YAML.load_file conf_file
-		conf = symbolize_keys conf
+        OpenStruct.new(
+            main: {
+                work_dir:           conf[:config][:work_dir],
+                log_file:           conf[:config][:log_file]
+            },
+            server: {
+                run_as:             conf[:config][:run_as]
+            },
+            zone_search: {
+                ignore_subdomains:  conf[:config][:ignore_subdomains],
+                cache_max:          conf[:config][:cache_max],
+                record_sets:        conf[:record_sets],
+                backend:            conf[:backend]
+            }
+        )
+    end
 
-		OpenStruct.new(
-			main: {
-				work_dir: 					conf[:config][:work_dir],
-				log_file: 					conf[:config][:log_file]
-			},
-			server: {
-				run_as: 						conf[:config][:run_as]
-			},
-			zone_search: {
-				ignore_subdomains: 	conf[:config][:ignore_subdomains],
-				cache_max: 					conf[:config][:cache_max],
-				record_sets: 				conf[:record_sets],
-				backend: 						conf[:backend]
-			}
-		)
-	end
+    def check_conf_file conf_file
+        unless File.readable? conf_file
+                Util.die "Conf file #{conf_file} not found or unreadable. Aborting." 
+        end
 
-	def check_conf_file conf_file
-		unless File.readable? conf_file
-				Util.die "Conf file #{conf_file} not found or unreadable. Aborting." 
-		end
+        conf_stat = File.stat conf_file
 
-		conf_stat = File.stat conf_file
-
-		unless conf_stat.mode.to_s(8) =~ /0600$/
-				Util.die "Conf file #{conf_file} must have mode 0600. Aborting." 
-		end
-	end
+        unless conf_stat.mode.to_s(8) =~ /0600$/
+                Util.die "Conf file #{conf_file} must have mode 0600. Aborting." 
+        end
+    end
 
 end; end
 