siriproxy 0.5.0 → 0.5.1

data/lib/siriproxy.rb

@@ -24,13 +24,28 @@ class SiriProxy
 
       begin
         listen_addr = $APP_CONFIG.listen || "0.0.0.0"
-        puts "[Info - Server] Starting SiriProxy on #{listen_addr}:#{$APP_CONFIG.port}.."
+        puts "[Info - Server] Starting SiriProxy on #{listen_addr}:#{$APP_CONFIG.port}..."
         EventMachine::start_server(listen_addr, $APP_CONFIG.port, SiriProxy::Connection::Iphone, $APP_CONFIG.upstream_dns) { |conn|
           puts "[Info - Guzzoni] Starting conneciton #{conn.inspect}" if $LOG_LEVEL < 1
           conn.plugin_manager = SiriProxy::PluginManager.new()
           conn.plugin_manager.iphone_conn = conn
         }
+      
+        retries = 0
+        while $APP_CONFIG.server_ip && !$SP_DNS_STARTED && retries <= 5
+          puts "[Info - Server] DNS server is not running yet, waiting #{2**retries} second#{'s' if retries > 0}..."
+          sleep 2**retries
+          retries += 1
+        end
+
+        if retries > 5
+          puts "[Error - Server] DNS server did not start up."
+          exit 1
+        end
+
+        EventMachine.set_effective_user($APP_CONFIG.user) if $APP_CONFIG.user
         puts "[Info - Server] SiriProxy up and running."
+
       rescue RuntimeError => err
         if err.message == "no acceptor"
           raise "[Error - Server] Cannot start the server on port #{$APP_CONFIG.port} - are you root, or have another process on this port already?"
@@ -38,9 +53,6 @@ class SiriProxy
           raise
         end
       end
-
-      EventMachine.set_effective_user($APP_CONFIG.user) if $APP_CONFIG.user
-      
     end
   end
 end

data/lib/siriproxy/dns.rb

@@ -23,9 +23,11 @@ class SiriProxy::Dns
     @thread = Thread.new {
       begin
         self.run(log_level)
+        $SP_DNS_STARTED = true
       rescue RuntimeError => e
         if e.message.match /^no acceptor/
-          puts "[Error - Server] You must be root to run the DNS server, DNS server is disabled"
+          puts "[Error - Server] Either you're not root or tcp/udp port 53 is in use. DNS server is disabled"
+          $SP_DNS_STARTED = true #Yeah, it didn't start, but we don't want to sit around and wait for it.
         else
           puts "[Error - Server] DNS Error: #{e.message}"
           puts "[Error - Server] DNS Server has crashed. Terminating SiriProxy"

data/lib/siriproxy/version.rb

@@ -1,3 +1,3 @@
 class SiriProxy
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: siriproxy
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-10 00:00:00.000000000 Z
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList