From cd68f7b88b9a2c9a4e4ff9fca61517384e54130a Mon Sep 17 00:00:00 2001 From: Aravinda VK Date: Thu, 21 Feb 2019 11:25:55 +0530 Subject: eventsapi: Fix Python3 compatibility issues - Fixed Relative import and non-package import related issues. - socketserver import issues fix - Renamed installed directory name to `gfevents` from `events`(To avoid any issues with other global libs) Fixes: bz#1679406 Change-Id: I3dc38bc92b23387a6dfbcc0ab8283178235bf756 Signed-off-by: Aravinda VK --- events/src/glustereventsd.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'events/src/glustereventsd.py') diff --git a/events/src/glustereventsd.py b/events/src/glustereventsd.py index 324695ecea..c4c7b65e33 100644 --- a/events/src/glustereventsd.py +++ b/events/src/glustereventsd.py @@ -28,10 +28,13 @@ from eventsapiconf import AUTO_BOOL_ATTRIBUTES, AUTO_INT_ATTRIBUTES from utils import logger, PidFile, PidFileLockFailed, boolify -class GlusterEventsRequestHandler(SocketServer.BaseRequestHandler): +class GlusterEventsRequestHandler(socketserver.BaseRequestHandler): def handle(self): data = self.request[0].strip() + if sys.version_info >= (3,): + data = self.request[0].strip().decode("utf-8") + logger.debug("EVENT: {0} from {1}".format(repr(data), self.client_address[0])) try: @@ -98,7 +101,7 @@ def init_event_server(): # Start the Eventing Server, UDP Server try: - server = SocketServer.ThreadingUDPServer( + server = socketserver.ThreadingUDPServer( (SERVER_ADDRESS, port), GlusterEventsRequestHandler) except socket.error as e: -- cgit