Skip to content

ref: Refactor integration init #42

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.

Sign up for GitHub

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

Merged
mitsuhiko merged 1 commit into from
Aug 31, 2018
Merged

ref: Refactor integration init #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions sentry_sdk/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@ def __exit__(self, exc_type, exc_value, tb):

def _init_on_hub(hub, args, kwargs):
options = get_options(*args, **kwargs)
install = setup_integrations(options)
client = Client(options)
hub.bind_client(client)
install()
setup_integrations(options)
return _InitGuard(client)


Expand Down
19 changes: 8 additions & 11 deletions sentry_sdk/integrations/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,16 @@ def _get_default_integrations():


def setup_integrations(options):
integrations = list(options.pop("integrations", None) or ())
default_integrations = options.pop("default_integrations") or False
integrations = list(options.get("integrations", None) or ())
default_integrations = options.get("default_integrations") or False

def install():
if default_integrations:
for cls in _get_default_integrations():
if not any(isinstance(x, cls) for x in integrations):
integrations.append(cls())
if default_integrations:
for cls in _get_default_integrations():
if not any(isinstance(x, cls) for x in integrations):
integrations.append(cls())

for integration in integrations:
integration()

return install
for integration in integrations:
integration()


class Integration(object):
Expand Down