Skip to content

Commit f991774

Browse files
committed
Remove poll_current_events helper
It was previously used as a helper in both table poll (refresh) mechanism, and as a helper to fetch event list with event state data (whether event row is expanded/selected). The former is replaced with ntie logic, the latter logic is moved to get_current_events
1 parent 9b43194 commit f991774

File tree

1 file changed

+0
-37
lines changed

1 file changed

+0
-37
lines changed

src/howitz/endpoints.py

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -155,43 +155,6 @@ def update_events():
155155
return updated_ids
156156

157157

158-
def poll_current_events():
159-
try:
160-
current_app.event_manager.get_events()
161-
except RetryError as retryErr: # Intermittent error in Zino
162-
current_app.logger.exception('RetryError when polling current events %s', retryErr)
163-
try:
164-
current_app.event_manager.get_events()
165-
except RetryError as retryErr: # Intermittent error in Zino
166-
current_app.logger.exception('RetryError when polling current events after retry, %s', retryErr)
167-
raise
168-
except NotConnectedError as notConnErr:
169-
if session["not_connected_counter"] > 1: # This error is not intermittent - increase counter and handle
170-
current_app.logger.exception('Recurrent NotConnectedError %s', notConnErr)
171-
session["not_connected_counter"] += 1
172-
raise
173-
else: # This error is intermittent - increase counter and retry
174-
current_app.logger.exception('Intermittent NotConnectedError %s', notConnErr)
175-
session["not_connected_counter"] += 1
176-
current_app.event_manager.get_events()
177-
pass
178-
179-
events = current_app.event_manager.events
180-
181-
events_sorted = {k: events[k] for k in sorted(events,
182-
key=lambda k: (
183-
0 if events[k].adm_state == AdmState.IGNORED else 1,
184-
events[k].updated,
185-
), reverse=True)}
186-
187-
poll_events = []
188-
for c in events_sorted.values():
189-
poll_events.append(create_table_event(c, expanded=str(c.id) in session["expanded_events"],
190-
selected=str(c.id) in session["selected_events"]))
191-
192-
return poll_events
193-
194-
195158
def refresh_current_events():
196159
event_ids = update_events()
197160
current_app.logger.debug('UPDATED EVENT IDS %s', event_ids)

0 commit comments

Comments
 (0)