projects
/
sitarba.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
bbe0d50
)
fix logging code
author
Stefan Huber <shuber2@gmx.at>
Tue, 15 May 2012 08:08:26 +0000
(10:08 +0200)
committer
Stefan Huber <shuber2@gmx.at>
Tue, 15 May 2012 08:08:26 +0000
(10:08 +0200)
shbackup
patch
|
blob
|
history
diff --git
a/shbackup
b/shbackup
index da28afecb1c8532307a7c795b29bf63be63ee2a1..41658696b6097a9272b3e49a0f7e291ec515e004 100755
(executable)
--- a/
shbackup
+++ b/
shbackup
@@
-255,9
+255,9
@@
class BackupManager:
def backupFileSet(self, fileset, targetdir, since=None):
"""Create an archive for given fileset at given target directory."""
def backupFileSet(self, fileset, targetdir, since=None):
"""Create an archive for given fileset at given target directory."""
- logger = logging.getLogger('backup')
+ logfile = logging.getLogger('backuplog')
+ logfile.info("Running file set: " + fileset.name)
- logger.info("Running file set: " + fileset.name)
tarpath = "/bin/tar"
fsfn = os.path.join(targetdir, fileset.name) + "." + self.conf.format
tarpath = "/bin/tar"
fsfn = os.path.join(targetdir, fileset.name) + "." + self.conf.format
@@
-270,7
+270,7
@@
class BackupManager:
taropts += ["--exclude", pat]
tarargs = [tarpath] + taropts + ["-f", fsfn] + fileset.dirs
taropts += ["--exclude", pat]
tarargs = [tarpath] + taropts + ["-f", fsfn] + fileset.dirs
- log
ger
.debug("tar call: " + " ".join(tarargs))
+ log
file
.debug("tar call: " + " ".join(tarargs))
tarp = subprocess.Popen( tarargs, bufsize=-1, \
stdout=subprocess.PIPE, stderr=subprocess.PIPE )
tarp = subprocess.Popen( tarargs, bufsize=-1, \
stdout=subprocess.PIPE, stderr=subprocess.PIPE )
@@
-287,9
+287,9
@@
class BackupManager:
rett = tarp.wait()
if rett != 0:
for l in tarp.stderr.readlines():
rett = tarp.wait()
if rett != 0:
for l in tarp.stderr.readlines():
- log
ger
.error( l.decode().strip().rstrip() )
+ log
file
.error( l.decode().strip().rstrip() )
sys.stderr.write( tarp.stderr.read().decode() )
sys.stderr.write( tarp.stderr.read().decode() )
- log
ger
.error(tarpath + " returned with exit status " + str(rett) + ".")
+ log
file
.error(tarpath + " returned with exit status " + str(rett) + ".")
def backup(self, epoch=None, mode=None):
def backup(self, epoch=None, mode=None):
@@
-345,17
+345,19
@@
class BackupManager:
os.mkdir( targetdir )
os.mkdir( targetdir )
- logger = logging.getLogger('backup')
- ch = logging.FileHandler( os.path.join(targetdir, "log") )
- ch.setLevel(logging.INFO)
- logger.addHandler(ch)
- logger.info("Started: " + now.ctime())
+ # Add file logger
+ logfile = logging.getLogger("backuplog")
+ fil = logging.FileHandler( os.path.join(targetdir, "log") )
+ fil.setLevel(logging.DEBUG)
+ logfile.addHandler(fil)
+
+ logfile.info("Started: " + now.ctime())
# Backup all file sets
for s in self.conf.sets:
self.backupFileSet(s, targetdir, since)
# Backup all file sets
for s in self.conf.sets:
self.backupFileSet(s, targetdir, since)
- log
ger
.info("Stopped: " + datetime.datetime.now().ctime())
+ log
file
.info("Stopped: " + datetime.datetime.now().ctime())
# Rename backup directory to final name
os.rename( targetdir, os.path.join(basedir, dirname) )
# Rename backup directory to final name
os.rename( targetdir, os.path.join(basedir, dirname) )
@@
-416,7
+418,7
@@
class BackupManager:
shutil.rmtree(os.path.join(basedir, d))
def ask_user_yesno(self, question):
shutil.rmtree(os.path.join(basedir, d))
def ask_user_yesno(self, question):
- if
logging.getLogger().isEnabledFor(logging.INFO)
:
+ if
LogConf.con.level <= logging.INFO
:
return input(question)
else:
return "y"
return input(question)
else:
return "y"
@@
-449,9
+451,29
@@
def printUsage():
print(" -V, --version print version info")
print(" -V, --version print version info")
+
+class LogConf:
+ """Encapsulates logging configuration"""
+
+ con = logging.StreamHandler(sys.stderr)
+
+ @classmethod
+ def setup(cls):
+ """Setup logging system"""
+ conlog = logging.getLogger()
+ conlog.setLevel(logging.DEBUG)
+
+ cls.con.setLevel(logging.WARNING)
+ conlog.addHandler(cls.con)
+
+ fillog = logging.getLogger("backuplog")
+ fillog.setLevel(logging.DEBUG)
+
+
if __name__ == "__main__":
if __name__ == "__main__":
- logging.basicConfig(format='%(message)s')
+ LogConf.setup()
+
conffn = "/etc/shbackup.conf"
cmd = "list"
mode = None
conffn = "/etc/shbackup.conf"
cmd = "list"
mode = None
@@
-475,7
+497,7
@@
if __name__ == "__main__":
exit(0)
elif opt in ["-v", "--verbose"]:
exit(0)
elif opt in ["-v", "--verbose"]:
-
logging.getLogger()
.setLevel(logging.INFO)
+
LogConf.con
.setLevel(logging.INFO)
elif opt in ["--verbosity"]:
i += 1
elif opt in ["--verbosity"]:
i += 1
@@
-483,7
+505,7
@@
if __name__ == "__main__":
numlevel = getattr(logging, level.upper(), None)
if not isinstance(numlevel, int):
raise ValueError('Invalid verbosity level: %s' % level)
numlevel = getattr(logging, level.upper(), None)
if not isinstance(numlevel, int):
raise ValueError('Invalid verbosity level: %s' % level)
-
logging.getLogger()
.setLevel(numlevel)
+
LogConf.con
.setLevel(numlevel)
elif opt in ["-m", "--mode"]:
i += 1
elif opt in ["-m", "--mode"]:
i += 1