Db/proxy cfg cmdline #3470
Merged
Db/proxy cfg cmdline #3470
+25
−3
Conversation
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
gmmeyer
approved these changes
Aug 8, 2017
| @@ -17,13 +17,29 @@ | |||
|
|
|||
| log = logging.getLogger(__name__) | |||
|
|
|||
| config_attributes = ['api_key', 'tags', 'hostname', 'proxy_host', 'proxy_port', 'proxy_user', 'proxy_password'] | |||
| try: | ||
| update_conf_file(registry_conf, get_config_path()) | ||
| log.info('update succeeded, deleting old values') | ||
| remove_registry_conf() |
There was a problem hiding this comment.
Just curious, why do we want to remove it from the registry?
There was a problem hiding this comment.
I wanted to remove the values from the registry so we don't end up with "two masters"... you put something on the install config. Then the install works. Then you change the config, but this is still lingering in the registry, waiting to be written back out to the config file (and killing your changes)
| for attribute in config_attributes: | ||
| try: | ||
| _winreg.DeleteValue(reg_key, attribute) | ||
| except Exception as e: |
There was a problem hiding this comment.
Will it error if the key doesn't exists? In that case, it seems like we would want to ignore that error instead of logging it.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What does this PR do?
Allows configuration of proxy parameters to be configured on the windows installer command line
Motivation
Customer request
Additional Notes
Needs companion PR DataDog/dd-agent-omnibus#192