-
Notifications
You must be signed in to change notification settings - Fork 45
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: Shutdown diagnostic thread if enabled #312
Merged
+11
−7
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -44,6 +44,7 @@ class DebugEvent: | |
def __init__(self, original_input: EventInputEvaluation): | ||
self.original_input = original_input | ||
|
||
|
||
class IndexEvent: | ||
__slots__ = ['timestamp', 'context'] | ||
|
||
|
@@ -57,7 +58,7 @@ def __init__(self, config: Config): | |
self._context_formatter = EventContextFormatter(config.all_attributes_private, config.private_attributes) | ||
|
||
def make_output_events(self, events: List[Any], summary: EventSummary): | ||
events_out = [ self.make_output_event(e) for e in events ] | ||
events_out = [self.make_output_event(e) for e in events] | ||
if not summary.is_empty(): | ||
events_out.append(self.make_summary_event(summary)) | ||
return events_out | ||
|
@@ -163,10 +164,10 @@ def make_output_event(self, e: Any): | |
|
||
return None | ||
|
||
""" | ||
Transform summarizer data into the format used for the event payload. | ||
""" | ||
def make_summary_event(self, summary: EventSummary): | ||
""" | ||
Transform summarizer data into the format used for the event payload. | ||
""" | ||
flags_out = dict() # type: Dict[str, Any] | ||
for key, flag_data in summary.flags.items(): | ||
flag_data_out = {'default': flag_data.default, 'contextKinds': list(flag_data.context_kinds)} | ||
|
@@ -246,7 +247,7 @@ def run(self): | |
def _do_send(self, output_events): | ||
# noinspection PyBroadException | ||
try: | ||
json_body = json.dumps(output_events, separators=(',',':')) | ||
json_body = json.dumps(output_events, separators=(',', ':')) | ||
log.debug('Sending events payload: ' + json_body) | ||
payload_id = str(uuid.uuid4()) | ||
r = _post_events_with_retry( | ||
|
@@ -442,8 +443,6 @@ def _get_indexable_context(self, event: EventInput, block: Callable[[Context], N | |
|
||
block(context) | ||
|
||
|
||
|
||
def _should_debug_event(self, event: EventInputEvaluation): | ||
if event.flag is None: | ||
return False | ||
|
@@ -492,6 +491,11 @@ def _send_and_reset_diagnostics(self): | |
def _do_shutdown(self): | ||
self._flush_workers.stop() | ||
self._flush_workers.wait() | ||
|
||
if self._diagnostic_flush_workers: | ||
self._diagnostic_flush_workers.stop() | ||
self._diagnostic_flush_workers.wait() | ||
Comment on lines
+495
to
+497
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. And here are those 3 lines. |
||
|
||
if self._close_http: | ||
self._http.clear() | ||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Lots of little whitespace changes while I was in this file. You can ignore pretty much everything except the 3 lines I'll call out.