summaryrefslogtreecommitdiffstats
path: root/events/src/glustereventsd.py
diff options
context:
space:
mode:
authorAravinda VK <avishwan@redhat.com>2019-02-21 11:25:55 +0530
committerAravinda VK <avishwan@redhat.com>2019-02-26 05:11:49 +0000
commite54a8ee281010106e46f67f80494da8cf80908e5 (patch)
tree2d210e39f5d4bddcd58e3fb12f75c75982fb8939 /events/src/glustereventsd.py
parent15403f96941caab4a4aa96630e47a9e831d32302 (diff)
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#1649054 Change-Id: I3dc38bc92b23387a6dfbcc0ab8283178235bf756 Signed-off-by: Aravinda VK <avishwan@redhat.com> (cherry picked from commit cd68f7b88b9a2c9a4e4ff9fca61517384e54130a)
Diffstat (limited to 'events/src/glustereventsd.py')
-rw-r--r--events/src/glustereventsd.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/events/src/glustereventsd.py b/events/src/glustereventsd.py
index 324695ecea3..c4c7b65e332 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: