diff options
| author | Aravinda VK <avishwan@redhat.com> | 2019-02-21 11:25:55 +0530 |
|---|---|---|
| committer | Shyamsundar Ranganathan <srangana@redhat.com> | 2019-02-26 14:11:41 +0000 |
| commit | 77f327862a60d602fe5d9847331e018de65f30a7 (patch) | |
| tree | 7a387b812a235c4984102d4677ecb4f3a2f06054 /events/src/glustereventsd.py | |
| parent | 3d7cd3d0f56f31dc8d87e9403f2c734c14de63f9 (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#1683008
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.py | 7 |
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: |