daemon.rb in rapnd-0.2.0

- old
+ new
@@ -2,55 +2,67 @@
 require 'openssl'
 require 'socket'
 require 'active_support/ordered_hash'
 require 'active_support/json'
 require 'base64'
+require 'airbrake'
+require 'logger'
 
 module Rapnd
   class Daemon
-    attr_accessor :redis, :host, :apple, :cert, :queue, :connected
+    attr_accessor :redis, :host, :apple, :cert, :queue, :connected, :logger, :airbrake
     
     def initialize(options = {})
-      puts 'Initializing daemon...'
       options[:redis_host]  ||= 'localhost'
       options[:redis_port]  ||= '6379'
       options[:host]        ||= 'gateway.sandbox.push.apple.com'
       options[:queue]       ||= 'rapnd_queue'
       options[:password]    ||= ''
       raise 'No cert provided!' unless options[:cert]
       
+      Airbrake.configure { |config| config.api_key = options[:airbrake]; @airbrake = true; } if options[:airbrake]
+      
       @redis = Redis.new(:host => options[:redis_host], :port => options[:redis_port])
       @queue = options[:queue]
       @cert = options[:cert]
       @host = options[:host]
-      puts "Listening on queue: #{self.queue}"
+      @logger = Logger.new("#{options[:dir]}/log/#{options[:queue]}.log")
+      @logger.info "Listening on queue: #{self.queue}"
     end
     
     def connect!
-      puts 'Connecting...'
+      @logger.info 'Connecting...'
       @context      = OpenSSL::SSL::SSLContext.new
       @context.cert = OpenSSL::X509::Certificate.new(File.read(@cert))
       @context.key  = OpenSSL::PKey::RSA.new(File.read(@cert), @password)
 
       @sock         = TCPSocket.new(@host, 2195)
       self.apple    = OpenSSL::SSL::SSLSocket.new(@sock, @context)
       self.apple.sync = true
       self.apple.connect
       
       self.connected = true
-      puts 'Connected!'
+      @logger.info 'Connected!'
       
       return @sock, @ssl
     end
     
     def run!
       message = @redis.blpop(self.queue, 1)
       if message
         notification = Rapnd::Notification.new(Marshal.load(message.last))
         self.connect! unless self.connected
-        puts "Sending Apple: #{notification.json_payload}"
+        @logger.info "Sending Apple: #{notification.json_payload}"
         self.apple.write(notification.to_bytes)
       end
       self.run!
+    rescue Exception => e
+      if e.class == Interrupt || e.class == SystemExit
+        @logger.info "Shutting down..."
+        exit(0)
+      end
+      Airbrake.notify(e, {:environment_name => self.queue }) if @airbrake
+      @logger.error "Encountered error: #{e}"
+      retry
     end
   end
 end
\ No newline at end of file