-
Notifications
You must be signed in to change notification settings - Fork 88
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
Bugfix/307 Fix replace_config to read prom2teams config #316
Merged
Merged
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
b7e4995
#307 fix docker replace_config when config file is a volume
de74246
#307 fix replace_config with external configfile
6c352c1
Merge branch 'develop' into bugfix/307
d21c764
update CHANGELOG.md
05f7f6d
#307 fix replace_config.py with tmp config files
ff08be3
#307 fix typo
2e8b259
Update CHANGELOG.md
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
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 |
---|---|---|
|
@@ -10,8 +10,11 @@ | |
filedata = filedata.replace("prom2teamsgroupalertsby", os.environ.get("PROM2TEAMS_GROUP_ALERTS_BY")) | ||
filedata = filedata.replace("prom2teamslogslevel", os.environ.get("PROM2TEAMS_LOGLEVEL")) | ||
|
||
with open('/opt/prom2teams/config.ini', 'w') as file: | ||
file.write(filedata) | ||
try: | ||
with open('/opt/prom2teams/config.ini', 'w') as file: | ||
file.write(filedata) | ||
except (PermissionError, OSError) as error: | ||
pass | ||
|
||
with open('/opt/prom2teams/uwsgi.ini', 'r') as file: | ||
uwsgi_filedata = file.read() | ||
|
@@ -22,6 +25,8 @@ | |
uwsgi_filedata = uwsgi_filedata.replace("uwsgihost", os.environ.get("UWSGI_HOST")) | ||
uwsgi_filedata = uwsgi_filedata.replace("uwsgiprotocol", os.environ.get("UWSGI_PROTOCOL")) | ||
|
||
|
||
with open('/opt/prom2teams/uwsgi.ini', 'w') as file: | ||
file.write(uwsgi_filedata) | ||
try: | ||
with open('/opt/prom2teams/uwsgi.ini', 'w') as file: | ||
file.write(uwsgi_filedata) | ||
except (PermissionError, OSError) as error: | ||
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. same same here 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. Change to tmp config files in case of config file from docker volume. |
||
pass |
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.
Why are you bypassing error handling ? If there is actual error, why we ignore it
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.
Change to tmp config files in case of config file from docker volume.