diff options
| author | Aravinda VK <avishwan@redhat.com> | 2016-08-18 14:51:44 +0530 |
|---|---|---|
| committer | Aravinda VK <avishwan@redhat.com> | 2016-08-24 01:23:06 -0700 |
| commit | d1aa35c3619847922e092b7dbfb201bceea8fa33 (patch) | |
| tree | a2f936c481b9201b63a4bf77f1346946f69cb8a3 /events/src/gf_event.py | |
| parent | 4aa52061a51b97c4f865b402f977b3b43f5471a7 (diff) | |
eventsapi: Fix disable-events issue
Events related sources are not loaded in libglusterfs when
configure is run with --disable-events option. Due to this
every call of gf_event should be guarded with USE_EVENTS macro.
To prevent this, USE_EVENTS macro was included in events.c
itself(Patch #15054)
Instead of disabling building entire directory "events", selectively
disabled the code. So that constants and empty function gf_event is
exposed. Code will not fail even if gf_event is called when events is
disabled.
BUG: 1368042
Change-Id: Ia6abfe9c1e46a7640c4d8ff5ccf0e9c30c87f928
Signed-off-by: Aravinda VK <avishwan@redhat.com>
Reviewed-on: http://review.gluster.org/15198
Smoke: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Diffstat (limited to 'events/src/gf_event.py')
| -rw-r--r-- | events/src/gf_event.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/events/src/gf_event.py b/events/src/gf_event.py index 0924a65dddb..20dfc8a4f17 100644 --- a/events/src/gf_event.py +++ b/events/src/gf_event.py @@ -13,7 +13,7 @@ import socket import time -from eventsapiconf import SERVER_ADDRESS +from eventsapiconf import SERVER_ADDRESS, EVENTS_ENABLED from eventtypes import all_events from utils import logger, setup_logger @@ -23,6 +23,9 @@ setup_logger() def gf_event(event_type, **kwargs): + if EVENTS_ENABLED == 0: + return + if not isinstance(event_type, int) or event_type >= len(all_events): logger.error("Invalid Event Type: {0}".format(event_type)) return |