Skip to content
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

Fix wrong bool handling of LOG_SHIP_HOURLY #1030

Merged
merged 4 commits into from
Oct 9, 2024
Merged

Fix wrong bool handling of LOG_SHIP_HOURLY #1030

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a63ea8d
ensure LOG_SHIP_HOURLY env var remains a string
FxKu Oct 9, 2024
30c3cfb
only allow true or empty for LOG_SHIP_HOURLY variable
FxKu Oct 9, 2024
4aabc49
Merge branch 'master' into hourly-logs-fix
FxKu Oct 9, 2024
ceea8e8
Update postgres-appliance/scripts/configure_spilo.py
FxKu Oct 9, 2024
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
6 changes: 4 additions & 2 deletions postgres-appliance/scripts/configure_spilo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,8 +599,10 @@ def get_placeholders(provider):
placeholders.setdefault('LOG_BUCKET_SCOPE_SUFFIX', '')

# only accept true as value or else it will be empty = disabled
if placeholders['LOG_SHIP_HOURLY']:
placeholders['LOG_SHIP_HOURLY'] = os.environ.get('LOG_SHIP_HOURLY', '') in ['true', 'TRUE']
if placeholders['LOG_SHIP_HOURLY'] and os.environ.get('LOG_SHIP_HOURLY').lower() == 'true':
FxKu marked this conversation as resolved.
Show resolved Hide resolved
placeholders['LOG_SHIP_HOURLY'] = 'true'
else:
placeholders['LOG_SHIP_HOURLY'] = ''

# see comment for wal-e bucket prefix
placeholders.setdefault('LOG_BUCKET_SCOPE_PREFIX', '{0}-'.format(placeholders['NAMESPACE'])
Expand Down
Loading