mail_daemon 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ecde2f676af4e347e1b2bb397cb159f90c3ff32
-  data.tar.gz: 31cfa71d1badd6db7ede971d9dc8d81b9a2ad806
+  metadata.gz: 684e8ea1da51fa99792aadf676aa68154e371161
+  data.tar.gz: 8ea4c2ea49a4b4b3601ea21ed591123509e03990
 SHA512:
-  metadata.gz: df0bbced18789453cab87582caf191167b05f512078a2e415456f4d0026eec91fc65de4342a8cef125425e210f55230b9aca4976ce716a8cca6a3d8ab8032ce7
-  data.tar.gz: 72dd6f014d8b61917d575f572f95774db97651d1d9f9943fc33f9ae8275f4bc88b680bc849b2113592c3c902bf0abff127ca5855e8f3aa34fc3c63708ddd95e0
+  metadata.gz: ecc74948196e37b832a972f6304928a5bbc0783a63785b6e1a1579fe4f7e2b81a9ee303bb75d63a08bd3339911100e179c562c6a079d00e87eb475196a40cac7
+  data.tar.gz: cbac2d2ec474d95ef29d2cebc9f2d53a7a817f854a2a99e3214cd9c15a075eca04d72e52805cd4eb4fde3c57efba8ba123d1d9abaf2b1af996ae36d0e10ebef1

data/lib/mail_daemon/email_body_parser.rb

@@ -19,7 +19,7 @@ module MailDaemon
       if exit_code == 0
         result
       else
-        puts result
+        puts result if @options[:debug]
         raise error
       end
     end

data/lib/mail_daemon/email_handler.rb

@@ -10,7 +10,7 @@ module MailDaemon
       @options = options
       @email = Mail.read_from_string(options[:inbound_message])
 
-      puts "Handling inbound email from #{@email.from}"
+      puts "Handling inbound email from #{@email.from}" if @options[:debug]
 
       if @email.multipart?
         @email.parts.each do |part|

data/lib/mail_daemon/imap/connection.rb

@@ -58,8 +58,7 @@ module MailDaemon
         puts "Selecting folder '#{@options[:folder]}'" if @options[:debug]
         @imap.select(@options[:folder])
 
-        # puts "starting tls"
-        # @imap.starttls({}, verify=false) if @options[:start_tls]
+        @imap.starttls({}, verify=false) if @options[:start_tls]
 
         @idle_required = true
         puts "Logged on." if @options[:debug]
@@ -87,6 +86,7 @@ module MailDaemon
                 @imap.idle_done
               rescue => e
                 puts e.message
+                puts e.backtrace.join("\n")
               end
             end
 
@@ -100,6 +100,7 @@ module MailDaemon
                 end
               rescue => e
                 puts e.message
+                puts e.backtrace.join("\n")
               end
             end
             recycle_thread.kill

data/lib/mail_daemon/version.rb

@@ -1,3 +1,3 @@
 module MailDaemon
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/mail_daemon.rb

@@ -62,7 +62,7 @@ module MailDaemon
       @options[:connections].each do |mailbox|
         mailbox[:ssl_options] = {:verify_mode => OpenSSL::SSL::VERIFY_NONE} if mailbox[:ssl]
 
-        puts "Setting up watcher for #{mailbox[:username]}"
+        puts "Setting up watcher for #{mailbox[:username]}" if @options[:debug]
         @watchers << MailDaemon::Imap::Watcher.new(mailbox.merge(:debug => @options[:debug]))
       end
       @threads = []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail_daemon
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - EmergeAdapt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2016-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,7 +73,6 @@ files:
 - lib/mail_daemon.rb
 - lib/mail_daemon/email_body_parser.rb
 - lib/mail_daemon/email_handler.rb
-- lib/mail_daemon/email_watcher.rb
 - lib/mail_daemon/encryption.rb
 - lib/mail_daemon/helpers.rb
 - lib/mail_daemon/imap/connection.rb

data/lib/mail_daemon/email_watcher.rb

@@ -1,155 +0,0 @@
-require 'redis'
-require 'ap'
-require 'mysql2'
-
-module MailDaemon
-  class EmailWatcher
-
-    def initialize
-
-      raise "REDIS_URL environment variable is required (eg redis://localhost:6739)" unless ENV["REDIS_URL"]
-      raise "MYSQL_HOST environment variable is required" unless ENV["MYSQL_HOST"]
-      raise "MYSQL_DATABASE environment variable is required" unless ENV["MYSQL_DATABASE"]
-      raise "MYSQL_USERNAME environment variable is required" unless ENV["MYSQL_USERNAME"]
-      raise "MYSQL_PASSWORD environment variable is required" unless ENV["MYSQL_PASSWORD"]
-
-      ENV["MYSQL_PASSWORD"] = "" unless ENV["MYSQL_PASSWORD"]
-      ENV["MYSQL_PORT"] = "3306"
-
-      redis_url = URI.parse(ENV["REDIS_URL"])
-
-      $redis = Redis.new(:host => redis_url.host, :port => redis_url.port)
-
-      Signal.trap("INT") {
-        Thread.new {self.stop}.join
-      }
-      # Trap `Kill `
-      Signal.trap("TERM") {
-        Thread.new {self.stop}.join
-      }
-
-
-
-      start
-    end
-
-    def configuration
-      mailboxes = []
-      mysql_client do |mysql|
-        statement = mysql.prepare("SELECT case_blocks_email_accounts.id, case_blocks_accounts.nickname, case_blocks_email_accounts.imap_username, case_blocks_email_accounts.imap_encrypted_password, case_blocks_email_accounts.imap_host, case_blocks_email_accounts.imap_port, case_blocks_email_accounts.imap_ssl, case_blocks_email_accounts.imap_start_tls, case_blocks_email_accounts.imap_folder_name, case_blocks_email_accounts.imap_search_command, case_blocks_email_accounts.imap_messages_processed, case_blocks_email_accounts.imap_last_processed_at FROM case_blocks_email_accounts JOIN case_blocks_accounts ON case_blocks_email_accounts.account_id = case_blocks_accounts.id where imap_enabled=1")
-        result = statement.execute()
-        result.each do |row|
-          ssl_options = row["imap_ssl"]==1 ? {:verify_mode => OpenSSL::SSL::VERIFY_NONE} : false
-          decrypted_password = Encryption.new.decrypt(row["imap_encrypted_password"])
-          mailboxes << {:id => row["id"], :account_code => row["nickname"], :username => row["imap_username"], :host => row["imap_host"], :port => row["imap_port"], :password => decrypted_password, :ssl_options => ssl_options, :start_tls => row["imap_start_tls"]==1, :name => row["imap_folder_nam"], :search_command => row["imap_search_command"], :message_count => row["imap_messages_processed"], :last_delivered_at => row["imap_last_processed_at"]}
-        end
-      end
-      mailboxes
-    end
-
-    def restart
-      self.stop if self.running?
-      self.reload unless @mailbox_config
-      self.start
-    end
-
-    def running?
-      @watchers.detect{|watcher| watcher.running?}
-    end
-
-    # Signal catching
-    def stop
-      @watchers.map{|watcher| watcher.stop}
-      @threads.map{|t| t.kill }
-    end
-
-    def start
-      @watchers = []
-
-      configuration.each do |mailbox|
-        puts "Setting up watcher for #{mailbox[:username]}"
-        @watchers << MailDaemon::Imap::Watcher.new(mailbox)
-      end
-
-      @threads = []
-      @watchers.each do |watcher|
-        @threads << Thread.new do
-          watcher.start do |message|
-            if message[:type] == "status_update"
-              update_status(message)
-            elsif message[:type] == "incoming_email"
-              handle_incoming_message(message)
-            else
-              puts "Unknown message type"
-              ap message
-            end
-          end
-        end
-      end
-      @threads.map{|t| t.join}
-
-    end
-
-    def handle_incoming_message(options)
-      @handler = MailDaemon::EmailHandler.new(options)
-      @handler.sanitize!
-      @handler.clean_replies!
-
-      hash = @handler.generate_message_hash
-
-      $redis.lpush(redis_key(options), hash)
-      puts "Queued."
-    end
-
-    def redis_key(options)
-      "cb:comms:#{options[:mailbox][:account_code]}:inbox"
-    end
-
-    def update_status(options)
-      puts "Status Update: #{options[:status]} for #{options[:mailbox][:username]}"
-      mysql_client do |mysql|
-        status_message = options[:status]
-        statement = mysql.prepare("UPDATE case_blocks_email_accounts SET imap_status='#{options[:status]}', imap_status_message='#{status_message}' where id=?")
-        statement.execute(options[:mailbox][:id])
-      end
-    end
-
-    private
-
-    def mysql_client(&block)
-      client = Mysql2::Client.new(:host => ENV["MYSQL_HOST"], :port => ENV["MYSQL_PORT"], :username => ENV["MYSQL_USERNAME"], :password => ENV["MYSQL_PASSWORD"], :database => ENV["MYSQL_DATABASE"])
-      yield client
-      client.close
-    end
-
-    def mailbox_status_message(watcher)
-      if watcher.logging_in?
-        "Connecting and Logging into server"
-      elsif watcher.logged_in?
-        "Connected"
-      else
-        "Disconnected"
-      end
-    end
-    def mailbox_status(watcher)
-      if watcher.logging_in?
-        :logging_in
-      elsif watcher.logged_in?
-        :connected
-      else
-        :disconnected
-      end
-    end
-    def mailbox_status_colour(watcher)
-      if watcher.logging_in?
-        "orange"
-      elsif watcher.logged_in?
-        "green"
-      else
-        "red"
-      end
-    end
-
-
-  end
-end