Skip to content

s3: workaround on-reload memleak when no role is set #318

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
alltilla merged 1 commit into from
Oct 2, 2024
Merged

s3: workaround on-reload memleak when no role is set #318

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
28 changes: 18 additions & 10 deletions modules/python-modules/syslogng/modules/s3/s3_destination.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,13 +249,13 @@ def open(self) -> bool:
if self.is_opened():
return True

self.session = Session(
aws_access_key_id=self.access_key if self.access_key != "" else None,
aws_secret_access_key=self.secret_key if self.secret_key != "" else None,
region_name=self.region,
)

if self.role != "":
self.session = Session(
aws_access_key_id=self.access_key if self.access_key != "" else None,
aws_secret_access_key=self.secret_key if self.secret_key != "" else None,
region_name=self.region,
)

# NOTE: The Session.set_credentials always creates a new Credentials object from the given keys.
# NOTE: The DeferredRefreshableCredentials class is a child of RefreshableCredentials which is a
# NOTE: child of the Credentials class.
Expand All @@ -271,10 +271,18 @@ def open(self) -> bool:
whoami = sts.get_caller_identity().get("Arn")
self.logger.info(f"Using {whoami} to access the bucket")

self.client = self.session.client(
service_name="s3",
endpoint_url=self.url if self.url != "" else None,
)
self.client = self.session.client(
service_name="s3",
endpoint_url=self.url if self.url != "" else None,
)
else:
self.client = client(
service_name="s3",
endpoint_url=self.url if self.url != "" else None,
aws_access_key_id=self.access_key if self.access_key != "" else None,
aws_secret_access_key=self.secret_key if self.secret_key != "" else None,
region_name=self.region,
)

is_opened = False
try:
Expand Down