From 71a026b3b7c13fdf242d387b255d6e0daefce0ca Mon Sep 17 00:00:00 2001
From: Sol Jerome <sol.jerome@gmail.com>
Date: Tue, 3 May 2011 14:05:07 -0500
Subject: Common: Fixes to get server to start with PY3K

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
---
 src/lib/Component.py | 47 ++++++++++++++++++++++++-----------------------
 src/lib/Logger.py    |  4 ++--
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/src/lib/Component.py b/src/lib/Component.py
index 222a856d6..88dce906e 100644
--- a/src/lib/Component.py
+++ b/src/lib/Component.py
@@ -153,30 +153,31 @@ class Component (object):
         automatic == True.
 
         """
-        for name, func in inspect.getmembers(self, callable):
-            if getattr(func, "automatic", False):
-                need_to_lock = not getattr(func, 'locking', False)
-                if (time.time() - func.automatic_ts) > \
-                   func.automatic_period:
-                    if need_to_lock:
-                        t1 = time.time()
-                        self.lock.acquire()
-                        t2 = time.time()
-                        self.instance_statistics.add_value('component_lock', t2-t1)
-                    try:
-                        mt1 = time.time()
+        for name, func in inspect.getmembers(self):
+            if name == '__call__':
+                if getattr(func, "automatic", False):
+                    need_to_lock = not getattr(func, 'locking', False)
+                    if (time.time() - func.automatic_ts) > \
+                       func.automatic_period:
+                        if need_to_lock:
+                            t1 = time.time()
+                            self.lock.acquire()
+                            t2 = time.time()
+                            self.instance_statistics.add_value('component_lock', t2-t1)
                         try:
-                            func()
-                        except:
-                            self.logger.error("Automatic method %s failed" \
-                                              % (name), exc_info=1)
-                    finally:
-                        mt2 = time.time()
-
-                    if need_to_lock:
-                        self.lock.release()
-                    self.instance_statistics.add_value(name, mt2-mt1)
-                    func.__dict__['automatic_ts'] = time.time()
+                            mt1 = time.time()
+                            try:
+                                func()
+                            except:
+                                self.logger.error("Automatic method %s failed" \
+                                                  % (name), exc_info=1)
+                        finally:
+                            mt2 = time.time()
+
+                        if need_to_lock:
+                            self.lock.release()
+                        self.instance_statistics.add_value(name, mt2-mt1)
+                        func.__dict__['automatic_ts'] = time.time()
 
     def _resolve_exposed_method(self, method_name):
         """Resolve an exposed method.
diff --git a/src/lib/Logger.py b/src/lib/Logger.py
index e3020d543..b49a7069f 100644
--- a/src/lib/Logger.py
+++ b/src/lib/Logger.py
@@ -118,7 +118,7 @@ class FragmentingSysLogHandler(logging.handlers.SysLogHandler):
     def emit(self, record):
         """Chunk and deliver records."""
         record.name = self.procname
-        if str(record.msg) > 250:
+        if len(record.msg) > 250:
             msgs = []
             error = record.exc_info
             record.exc_info = None
@@ -136,7 +136,7 @@ class FragmentingSysLogHandler(logging.handlers.SysLogHandler):
                                                                 newrec.levelname.lower()),
                                             self.format(newrec))
             try:
-                self.socket.send(msg)
+                self.socket.send(msg.encode('ascii'))
             except socket.error:
                 for i in range(10):
                     try:
-- 
cgit v1.2.3-1-g7c22