summaryrefslogtreecommitdiffstats
path: root/events/src/gf_event.py
diff options
context:
space:
mode:
authorKotresh HR <khiremat@redhat.com>2018-10-06 09:20:24 +0530
committerShyamsundar Ranganathan <srangana@redhat.com>2018-10-10 14:08:52 +0000
commit324384ca48944662fecdffe72faa5d2c5872eb5f (patch)
tree76a2b3d0756fc00d49d9bb1c163d9ed2b4eeb646 /events/src/gf_event.py
parent3a962b17ad82a7a80da804550cfdf84ec4ec82fd (diff)
events: python2 to python3 compat
1. Fix imports 2. Use universal_newlines flag in Popen 3. encode msg used in 'sendto' Updates: #411 Change-Id: Ieacdc2ba86953ff3a2e9d9b9a97157e8e0e36836 Signed-off-by: Kotresh HR <khiremat@redhat.com> (cherry picked from commit b5f75e337c19d4fed85d4dcf15cf47f02fea5f6a)
Diffstat (limited to 'events/src/gf_event.py')
-rw-r--r--events/src/gf_event.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/events/src/gf_event.py b/events/src/gf_event.py
index 1454063c863..a60adecf867 100644
--- a/events/src/gf_event.py
+++ b/events/src/gf_event.py
@@ -13,10 +13,10 @@
import socket
import time
-from eventsapiconf import SERVER_ADDRESS, EVENTS_ENABLED
-from eventtypes import all_events
+from .eventsapiconf import SERVER_ADDRESS, EVENTS_ENABLED
+from .eventtypes import all_events
-from utils import logger, setup_logger, get_config
+from .utils import logger, setup_logger, get_config
# Run this when this lib loads
setup_logger()
@@ -36,18 +36,18 @@ def gf_event(event_type, **kwargs):
logger.error("Unable to connect to events Server: {0}".format(e))
return
+ port = get_config("port")
+ if port is None:
+ logger.error("Unable to get eventsd port details")
+ return
+
# Convert key value args into KEY1=VALUE1;KEY2=VALUE2;..
msg = ""
for k, v in kwargs.items():
msg += "{0}={1};".format(k, v)
# <TIMESTAMP> <EVENT_TYPE> <MSG>
- msg = "{0} {1} {2}".format(int(time.time()), event_type, msg.strip(";"))
-
- port = get_config("port")
- if port is None:
- logger.error("Unable to get eventsd port details")
- return
+ msg = "{0} {1} {2}".format(int(time.time()), event_type, msg.strip(";")).encode()
try:
sent = client.sendto(msg, (SERVER_ADDRESS, port))