ddns 0.1.0 → 0.1.1

data/bin/ddns

@@ -4,6 +4,7 @@ require 'fileutils'
 require 'drb/drb'
 require 'ddns-server'
 require 'optparse'
+require 'resolv'
 require 'socket'
 
 LOGGER = Logger.new($stderr)
@@ -15,6 +16,7 @@ options = {
   :gaddress => IPSocket.getaddress(Socket.gethostname),
   :gport    => 10870,
   :sock     => '/tmp/ddns.sock',
+  :resolver => Resolv::DNS.new,
   :daemon   => false,
   :logger   => LOGGER,
   :loglevel => Logger::INFO
@@ -28,6 +30,8 @@ opts.on('-a', '--gaddress ADDRESS'     "Gossip service ip address (default #{opt
 opts.on('-p', '--gport PORT', Integer, "Gossip service port (default #{options[:gport]})")          {|v| options[:gport]    = v }
 opts.on('-S', '--socket SOCK',         "Socket file path (default #{options[:sock]})")              {|v| options[:sock]     = v }
 opts.on('-d', '--daemon COMMAND',      "Directive of daemonize (start|stop|restart|status)")        {|v| options[:daemon]   = v }
+opts.on('-r', '--resolver CONF',       "Default resolver (default /etc/resolv.conf)")               {|v| options[:resolver] = Resolv::DNS.new(v) }
+opts.on('-N', '--no-resolver',         "Not use default resolver")                                  {|v| options[:resolver] = nil }
 
 opts.on('-L', '--loglevel LEVEL',
   [:fatal, :error, :warn, :info, :debug], "Log level (default info)") {|v| options[:loglevel] = Logger.const_get(v.to_s.upcase) }

data/lib/ddns-server.rb

@@ -27,7 +27,7 @@ class DDNS < RExec::Daemon::Base
       @gaddress      = options[:gaddress] || IPSocket.getaddress(Socket.gethostname)
       @sock          = options[:sock]
       @daemon        = options[:daemon]
-      @resolver      = options[:resolver] || Resolv::DNS.new
+      @resolver      = options[:resolver]
       @logger        = options[:logger] || Logger.new($stderr)
       @loglevel      = options[:loglevel] || Logger::INFO
       @logger.level  = @loglevel
@@ -69,6 +69,9 @@ class DDNS < RExec::Daemon::Base
 
     RubyDNS.run_server(:listen => [[:udp, $DDNS_ATTR.address, $DDNS_ATTR.port]]) do
       on(:start) do
+        $stdout.sync = true
+        $stderr.sync = true
+
         logger.level = $DDNS_ATTR.loglevel
 
         if $DDNS_ATTR.daemon and $DDNS_ATTR.sock
@@ -87,8 +90,10 @@ class DDNS < RExec::Daemon::Base
         transaction.respond!(Resolv::DNS::Name.create("#{data}."))
       end
 
-      otherwise do |transaction|
-        transaction.passthrough!($DDNS_ATTR.resolver)
+      if $DDNS_ATTR.resolver
+        otherwise do |transaction|
+          transaction.passthrough!($DDNS_ATTR.resolver)
+        end
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ddns
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - winebarrel
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-24 00:00:00 +09:00
-default_executable: 
+date: 2011-05-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubydns
@@ -42,12 +41,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 9
         segments: 
         - 0
         - 1
-        - 8
-        version: 0.1.8
+        - 9
+        version: 0.1.9
   type: :runtime
   version_requirements: *id002
 description: 
@@ -61,10 +60,9 @@ extra_rdoc_files: []
 
 files: 
 - README
-- bin/ddns
 - bin/ddnsctl
+- bin/ddns
 - lib/ddns-server.rb
-has_rdoc: true
 homepage: https://bitbucket.org/winebarrel/ddns
 licenses: []
 
@@ -94,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.8.1
 signing_key: 
 specification_version: 3
 summary: Distributed name server