diff options
author | ben <ben@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2002-10-05 07:37:32 +0000 |
---|---|---|
committer | ben <ben@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2002-10-05 07:37:32 +0000 |
commit | a957d24412318bdd6dba162e4bc51680ad118036 (patch) | |
tree | af1ccb4bccd9d2facd79d10c1a4110c9d747752c /rdiff-backup/rdiff_backup/log.py | |
parent | 23864c166d3cd702158733118f5e388c97cbf5d7 (diff) | |
download | rdiff-backup-a957d24412318bdd6dba162e4bc51680ad118036.tar.gz |
Added David S.'s major/minor patch in cmodule.c,
SetConnections.py now normalizes rpaths,
log.py now returns LoggerError if can't open logfile,
Main.py catches logger error if can't open restore log
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@216 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/rdiff_backup/log.py')
-rw-r--r-- | rdiff-backup/rdiff_backup/log.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/rdiff-backup/rdiff_backup/log.py b/rdiff-backup/rdiff_backup/log.py index 39918e0..1e5998e 100644 --- a/rdiff-backup/rdiff_backup/log.py +++ b/rdiff-backup/rdiff_backup/log.py @@ -37,7 +37,7 @@ class Logger: try: self.term_verbosity = int(termverb_string) except ValueError: Log.FatalError("Terminal verbosity must be a number, received " - "'%s' insteaxd." % termverb_string) + "'%s' instead." % termverb_string) self.termverbset = 1 def open_logfile(self, rpath): @@ -48,9 +48,9 @@ class Logger: """ assert not self.log_file_open + rpath.conn.Log.open_logfile_local(rpath) for conn in Globals.connections: conn.Log.open_logfile_allconn(rpath.conn) - rpath.conn.Log.open_logfile_local(rpath) def open_logfile_allconn(self, log_file_conn): """Run on all connections to signal log file is open""" @@ -59,10 +59,13 @@ class Logger: def open_logfile_local(self, rpath): """Open logfile locally - should only be run on one connection""" - assert self.log_file_conn is Globals.local_connection + assert rpath.conn is Globals.local_connection + try: self.logfp = rpath.open("a") + except (OSError, IOError), e: + raise LoggerError("Unable to open logfile %s: %s" + % (rpath.path, e)) self.log_file_local = 1 self.logrp = rpath - self.logfp = rpath.open("a") def close_logfile(self): """Close logfile and inform all connections""" |