From: Oleg Broytman <phd@phdru.name>
Date: Wed, 11 Aug 2010 16:48:09 +0000 (+0000)
Subject: More logging.
X-Git-Tag: v4.5.3~121
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=a58c2f2c09fffa02089ddeb564f5224f1eea5d9c;hp=c3a7353a026f35ab8d02a1a05b320e7a37c2dc13;p=bookmarks_db.git

More logging.


git-svn-id: file:///home/phd/archive/SVN/bookmarks_db/trunk@255 fdd5c36f-1aea-0310-aeeb-c58d7e2b6c23
---

diff --git a/Robots/bkmk_rsimple.py b/Robots/bkmk_rsimple.py
index afeeb25..2288996 100644
--- a/Robots/bkmk_rsimple.py
+++ b/Robots/bkmk_rsimple.py
@@ -1,7 +1,7 @@
 """
    Simple, strightforward robot
 
-   Written by Oleg Broytman. Copyright (C) 2000-2008 PhiloSoft Design.
+   Written by Oleg Broytman. Copyright (C) 2000-2010 PhiloSoft Design.
 """
 
 import sys, os
@@ -239,22 +239,28 @@ class robot_simple(Robot):
       except IOError, msg:
          if (msg[0] == "http error") and (msg[1] == -1):
             bookmark.no_error = "The server did not return any header - it is not an error, actually"
+            self.log(bookmark.no_error)
          else:
             bookmark.error = get_error(msg)
+            self.log(bookmark.error)
 
       except EOFError:
          bookmark.error = "Unexpected EOF (FTP server closed connection)"
+         self.log(bookmark.error)
 
       except RedirectException, msg:
          bookmark.moved = str(msg)
+         self.log(bookmark.moved)
 
       except KeyboardInterrupt:
+         self.log("Keyboard interrupt (^C)")
          return 0
 
       except:
          import traceback
          traceback.print_exc()
          bookmark.error = "Exception!"
+         self.log(bookmark.error)
 
       finally:
          self.finish_check_url(bookmark)
diff --git a/Robots/bkmk_rsimple_tos.py b/Robots/bkmk_rsimple_tos.py
index 6e03215..0be22b8 100644
--- a/Robots/bkmk_rsimple_tos.py
+++ b/Robots/bkmk_rsimple_tos.py
@@ -1,7 +1,7 @@
 """
    Simple robot with socket's timeout
 
-   Written by Broytman. Copyright (C) 2000-2007 PhiloSoft Design
+   Written by Broytman. Copyright (C) 2000-2010 PhiloSoft Design
 """
 
 import socket
@@ -16,6 +16,7 @@ class robot_simple_tos(robot_simple):
          return robot_simple.check_url(self, bookmark)
       except socket.error, msg:
          bookmark.error = get_error(msg)
+         self.log(bookmark.error)
 
       self.finish_check_url(bookmark)
       return 1