mail_daemon 0.0.10 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cd812263f7c714bdce09da22ccc21d608f81a53
-  data.tar.gz: 468f8a17341b9e87ccb5d2df0713318f4ec74130
+  metadata.gz: adeb6c1d708a1c275f706ea1a9b45f336dd1acbb
+  data.tar.gz: 6c90be4d828aff1fe6d15a2d4fa83bcec90758f8
 SHA512:
-  metadata.gz: f659ab1b7ea3f773d1a96d2de4004515c6b129310ffcc189d3e938d5cfaac37856f9726ad814a6e97ee048839168a4053625916419d58331e68592ba79222af6
-  data.tar.gz: 7568022856846dcaec67ad2a54d8d7762127e0ffeee5565ece2724c90ddfb6caa87f0b7ab8f5893a0d71746a191aacfccabba2abbf809a3786bd9144365ad81c
+  metadata.gz: fd8f2b32bf3f3c38fc3ffc17f19be95fe76df86ece4340ceb86e27079f882e4bdb0a08979072c722e0ad9e1b4a54676d85158c8341ec92bda8f38fb5788e918d
+  data.tar.gz: e0021e2d53f84046ea1460cb15a296edd04c78c4a608bd5dea5590035bbdc9c52e1e4a07f7687e09d11aaca7fd0cba14adc3bcbb2fc983d329d5a1cb237868ae

data/lib/mail_daemon/imap/connection.rb

@@ -131,7 +131,7 @@ module MailDaemon
           puts e.message
         end
         set_status(LOGGING_OFF)
-        @imap.logout unless @imap.disconnected?
+        @imap.logout unless imap.disconnected?
         set_status(LOGGED_OFF)
       end
 

data/lib/mail_daemon/imap/watcher.rb

@@ -5,11 +5,10 @@ module MailDaemon
 
       def initialize(options)
         @options = options
-
       end
 
       def start(&block)
-        
+
         @connection = Imap::Connection.new(@options, &block)
         @connection.login
         # @thread = Thread.new do
@@ -38,6 +37,10 @@ module MailDaemon
         @options[:mailbox]
       end
 
+      def to_s
+        "#{@options[:account_code]}/#{@options[:username]}"
+      end
+
     end
   end
 end

data/lib/mail_daemon/imap_watcher.rb

@@ -36,12 +36,17 @@ module MailDaemon
 
       watchers = []
       mysql_client do |mysql|
-        statement = mysql.prepare("SELECT * FROM case_blocks_email_accounts where imap_enabled=1")
+        statement = mysql.prepare("select ea.*, a.nickname from case_blocks_email_accounts ea join case_blocks_accounts a on a.id = ea.account_id where ea.imap_enabled=1")
         result = statement.execute()
         result.each do |row|
           ssl = row["imap_ssl"]==1 ? {:verify_mode => "none"} : false
           decrypted_password = Encryption.new.decrypt(row["imap_encrypted_password"])
-          watchers << Imap::Connection.new({:email => row["imap_username"], :host => row["imap_host"], :port => row["imap_port"], :password => decrypted_password, :ssl => ssl, :start_tls => row["imap_start_tls"]==1, :name => row["imap_folder_name"], :search_command => row["imap_search_command"], :message_count => row["imap_messages_processed"], :last_delivered_at => row["imap_last_delivered_at"], :delivery_method=>"sidekiq", :delivery_options=>{:redis_url => ENV["REDIS_URL"], :queue => "email_handler", :worker=>"EmailHandlerWorker"}})
+          begin
+            watcher = Imap::Connection.new({:email => row["imap_username"], :host => row["imap_host"], :port => row["imap_port"], :password => decrypted_password, :ssl => ssl, :start_tls => row["imap_start_tls"]==1, :name => row["imap_folder_name"], :search_command => row["imap_search_command"], :message_count => row["imap_messages_processed"], :last_delivered_at => row["imap_last_delivered_at"], :delivery_method=>"sidekiq", :delivery_options=>{:redis_url => ENV["REDIS_URL"], :queue => "email_handler", :worker=>"EmailHandlerWorker"}})
+            watchers << watcher
+          rescue => e
+            puts "Unable to create IMAP4 connection for #{row['nickname']}/#{row['name']}. #{e.message}"
+          end
         end
       end
 

data/lib/mail_daemon/version.rb

@@ -1,3 +1,3 @@
 module MailDaemon
-  VERSION = "0.0.10"
+  VERSION = "0.0.12"
 end

data/lib/mail_daemon.rb

@@ -68,9 +68,13 @@ module MailDaemon
       @threads = []
       @watchers.each do |watcher|
         @threads << Thread.new do
-          watcher.start do |message|
-            type = message.delete(:type)
-            yield message, type
+          begin
+            watcher.start do |message|
+              type = message.delete(:type)
+              yield message, type
+            end
+          rescue => e
+            puts "#{watcher}: #{e.message}" 
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail_daemon
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
 platform: ruby
 authors:
 - EmergeAdapt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-15 00:00:00.000000000 Z
+date: 2017-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: IMAP account daemon to watch for new mail and to execute a ruby block with