clacks 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c26bb094d7008dbb5094d22439e3fc55c75a375
-  data.tar.gz: b6f54e2f8b485168c67b41b1fc0f5689c9e1e046
+  metadata.gz: 8266944afd67107ca0d77a1ddb825c8e3e720ddc
+  data.tar.gz: e01a4bb50db6e6f24586e9bd86502375035e4001
 SHA512:
-  metadata.gz: d8c93393c43b4a7d19e0829efc1d83e1feecb478e1c34884d178c7bf02a304fa8bb60b3596b2cb7ca35f3d055eb4056763d874ccaca3d7a02f5e24c14e7c62ac
-  data.tar.gz: 9b102599520b751e9be9093f0ba6c61d2647e6ef3c90a67c95175b9c7c6db6401dfd7c5798ddda0a3894aa2a50f65bf1fe9f5950963668159c09fe2a9a912a16
+  metadata.gz: b217905633b1d4f0999004d849cb5dd752d3eb3c15c33800e81a2d4484759b2e909a4b3b63e5f87932fd7cb20bc68e566a4292e7afba69f794d421f5f1681e64
+  data.tar.gz: 3cc3bfd8c94890e409f20421a00ddf9aa16568ea2c6994c58c6e87808c998ccb772113abcc946b6d90a0e517e198c73bde462fe7490acec5ecfc52688ca8a41a

data/lib/clacks/service.rb

@@ -10,17 +10,22 @@ module Clacks
     #   IMAP server timeout: typically after 30 minutes with no activity.
     #   NAT Gateway timeout: typically after 15 minutes with an idle connection.
     # The solution to this is for the IMAP client to issue a NOOP (No Operation) command
-    # at intervals, typically every 15 minutes.
-    IMAP_NOOP_SLEEP = 15 * 60   # 15 minutes
+    # at intervals, typically every 12 minutes.
+    IMAP_NOOP_SLEEP = 12 * 60   # 12 minutes
 
     def run
-      Clacks.logger.info "Clacks v#{Clacks::VERSION} started"
-      if Clacks.config[:pop3]
-        run_pop3
-      elsif Clacks.config[:imap]
-        run_imap
-      else
-        raise "Either a POP3 or an IMAP server must be configured"
+      begin
+        Clacks.logger.info "Clacks v#{Clacks::VERSION} started"
+        if Clacks.config[:pop3]
+          run_pop3
+        elsif Clacks.config[:imap]
+          run_imap
+        else
+          raise "Either a POP3 or an IMAP server must be configured"
+        end
+      rescue Exception => e
+        Clacks.logger.error("#{e.message} (#{e.class})\n#{(e.backtrace || []).join("\n")}")
+        raise e
       end
     end
 
@@ -103,7 +108,7 @@ module Clacks
           # reconnect in next loop
         rescue Net::IMAP::Error, IOError => e
           # OK: reconnect in next loop
-        rescue => e
+        rescue StandardError => e
           Clacks.logger.error("#{e.message} (#{e.class})\n#{(e.backtrace || []).join("\n")}")
           sleep(5) unless stopping?
         end
@@ -112,14 +117,17 @@ module Clacks
     end
 
     def imap_nooper
-      @imap_nooper = Thread.new do
+      Thread.new do
         loop do
           begin
             sleep IMAP_NOOP_SLEEP
             @imap.idle_done
             @imap.noop
-          rescue
+          rescue StandardError
             # noop
+          rescue Exception => e
+            Clacks.logger.error("#{e.message} (#{e.class})\n#{(e.backtrace || []).join("\n")}")
+            raise e
           end
         end
       end
@@ -147,9 +155,9 @@ module Clacks
             mail = Mail.new(source)
             mail.mark_for_delete = true if delete_after_find
             Clacks.config[:on_mail].call(mail)
-          rescue Exception => e
-            Clacks.logger.debug(e.message)
-            Clacks.logger.debug(e.backtrace)
+          rescue StandardError => e
+            Clacks.logger.error(e.message)
+            Clacks.logger.error(e.backtrace)
           end
           begin
             imap.uid_copy(uid, options[:archivebox]) if options[:archivebox]
@@ -157,7 +165,7 @@ module Clacks
               expunge = true
               imap.uid_store(uid, "+FLAGS", [Net::IMAP::DELETED])
             end
-          rescue Exception => e
+          rescue StandardError => e
             Clacks.logger.error(e.message)
           end
           processed += 1
@@ -185,9 +193,9 @@ module Clacks
             else
               begin
                 on_mail.call(mail)
-              rescue Exception => e
-                Clacks.logger.debug(e.message)
-                Clacks.logger.debug(e.backtrace)
+              rescue StandardError => e
+                Clacks.logger.error(e.message)
+                Clacks.logger.error(e.backtrace)
               end
             end
           end

data/lib/clacks/version.rb

@@ -1,3 +1,3 @@
 module Clacks
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clacks
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - ITRP
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-24 00:00:00.000000000 Z
+date: 2016-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail