summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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: