Marmelator/pyinfra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 36 Wiki Activity

RED-4653: Added value to config to prevent writing the token as a default since that is only useful in a container

Browse Source
This commit is contained in:
Viktor Seifert 2022-08-01 17:00:44 +02:00
parent eed5912516
commit 8867da3557
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pyinfra/config.py
View File

@ -54,6 +54,9 @@ class Config(object):
"STORAGE_AZURECONNECTIONSTRING", "DefaultEndpointsProtocol=..."
)
# Value to see if we should write a consumer token to a file
self.write_consumer_token = read_from_environment("WRITE_CONSUMER_TOKEN", "False")
def get_config() -> Config:
return Config()

14
pyinfra/queue/queue_manager.py
View File

@ -31,7 +31,7 @@ def _get_n_previous_attempts(props):
def token_file_name():
token_file_path = Path(__file__).parent / "consumer_token.txt"
token_file_path = Path("/var/run") / "consumer_token.txt"
return token_file_path
@ -40,6 +40,8 @@ class QueueManager(object):
self.logger = logging.getLogger("queue_manager")
self.logger.setLevel(config.logging_level_root)
self._write_token = config.write_consumer_token == "True"
self._set_consumer_token(None)
self._connection_params = get_connection_params(config)
@ -54,11 +56,13 @@ class QueueManager(object):
def _set_consumer_token(self, token_value):
self._consumer_token = token_value
token_file_path = token_file_name()
with token_file_path.open(mode="w", encoding="utf8") as token_file:
text = token_value is not None if token_value else ""
token_file.write(text)
if self._write_token:
token_file_path = token_file_name()
with token_file_path.open(mode="w", encoding="utf8") as token_file:
text = token_value is not None if token_value else ""
token_file.write(text)
def _open_channel(self):
self._connection = pika.BlockingConnection(parameters=self._connection_params)