summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2006-03-29 20:16:27 +0000
committerNarayan Desai <desai@mcs.anl.gov>2006-03-29 20:16:27 +0000
commit53d678d24a60c6100bfcd95f49b2e40bf1093ca4 (patch)
tree6fa936264c305d0363bbcba628861ed417df4f2e
parentd4959f35afba47e1b92f02f00f77b1186aafbacf (diff)
downloadbcfg2-53d678d24a60c6100bfcd95f49b2e40bf1093ca4.tar.gz
bcfg2-53d678d24a60c6100bfcd95f49b2e40bf1093ca4.tar.bz2
bcfg2-53d678d24a60c6100bfcd95f49b2e40bf1093ca4.zip
* Fix fam integration with svn
* Fix traceback handing in logging infrastructure (from Cobalt repo) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1816 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--src/lib/Logging.py1
-rw-r--r--src/lib/Server/Core.py9
2 files changed, 4 insertions, 6 deletions
diff --git a/src/lib/Logging.py b/src/lib/Logging.py
index 980a88db4..65ae15187 100644
--- a/src/lib/Logging.py
+++ b/src/lib/Logging.py
@@ -94,6 +94,7 @@ class FragmentingSysLogHandler(logging.handlers.SysLogHandler):
if str(record.msg) > 250:
msgs = []
error = record.exc_info
+ record.exc_info = None
msgdata = record.msg
while msgdata:
newrec = copy.deepcopy(record)
diff --git a/src/lib/Server/Core.py b/src/lib/Server/Core.py
index 7b12e2d26..7820cfca4 100644
--- a/src/lib/Server/Core.py
+++ b/src/lib/Server/Core.py
@@ -304,12 +304,9 @@ class Core(object):
def Service(self):
'''Perform periodic update tasks'''
- while self.fam.fm.pending:
- try:
- if self.fam.HandleEvent() and self.svn:
- self.read_svn_revision()
- except:
- logger.error("error in FamEvent", exc_info=1)
+ count = self.fam.Service()
+ if count and self.svn:
+ self.read_svn_revision()
try:
self.stats.WriteBack()
except: