git-svn-id: svn+ssh://svn.gna.org/svn/feed2imap/trunk/feed2imap@31 f70e237a-67f3-0310-a06c-d2b8a7116972

2 files changed, 7 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 1c84f51..1a40edd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 Feed2Imap 0.4 (date unknown)
 ============================
+* Feed2Imap version number wasn't displayed in the User-Agent
+* Better exception handling when parsing errors occur
 * added feed2imap's RSS feed to the default feeds in the config file
 
 Feed2Imap 0.3 (04/06/2005)
diff --git a/lib/feed2imap/feed2imap.rb b/lib/feed2imap/feed2imap.rb
index 3083e88..59997e8 100644
--- a/lib/feed2imap/feed2imap.rb
+++ b/lib/feed2imap/feed2imap.rb
@@ -19,6 +19,9 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 =end
 
+# Feed2Imap version
+F2I_VERSION = '0.4'
+
 require 'feed2imap/config'
 require 'feed2imap/cache'
 require 'feed2imap/channel'
@@ -26,9 +29,6 @@ require 'feed2imap/httpfetcher'
 require 'logger'
 require 'thread'
 
-# Feed2Imap version
-F2I_VERSION = '0.4'
-
 class Feed2Imap
   def initialize(verbose, cacherebuild, configfile)
     @logger = Logger::new(STDOUT)
@@ -110,8 +110,8 @@ class Feed2Imap
       next if f.body.nil? # means 304
       begin
         channel = Channel::new(f.body)
-      rescue
-        @logger.fatal("Error while parsing #{f.name}: #{$!}")
+      rescue Exception => e
+        @logger.fatal("Error while parsing #{f.name}: #{e}")
         next
       end
       begin