x/slogging
Code Issues Proposed changes

added error checks to log uploader

Browse Source
This commit is contained in:
John Dickinson 2012-01-17 09:22:37 -06:00
parent d35d8cf00c
commit ca810882f9
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
slogging/log_uploader.py
View File

@ -21,6 +21,7 @@ import gzip
import re
import sys
from paste.deploy import appconfig
import zlib
from slogging.internal_proxy import InternalProxy
from swift.common.daemon import Daemon
@ -143,14 +144,22 @@ class LogUploader(Daemon):
return
for filename, match in filename2match.items():
# don't process very new logs
seconds_since_mtime = time.time() - os.stat(filename).st_mtime
try:
seconds_since_mtime = time.time() - os.stat(filename).st_mtime
except OSError:
# filename wasn't found, skip it
continue
if seconds_since_mtime < self.new_log_cutoff:
self.logger.debug(_("Skipping log: %(file)s "
"(< %(cutoff)d seconds old)") % {
'file': filename,
'cutoff': self.new_log_cutoff})
continue
self.upload_one_log(filename, **match)
try:
self.upload_one_log(filename, **match)
except (OSError, zlib.error):
self.logger.exception(
_('ERROR: could not upload %s') % filename)
def upload_one_log(self, filename, year, month, day, hour):
"""