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

Added migrator dependency on cluster_connection_properties #61

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Added migrator dependency on cluster_connection_properties #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2287b81
added migrator dependency on cluster_connection_properties property o…
Oct 22, 2021
cb62a3b
returned previous cluster props for compatibility
Oct 22, 2021
5042daf
remove timeouts
Oct 22, 2021
7c31e91
add cluster_connection_properties to config
Oct 22, 2021
53f799c
return to the original config style
Oct 22, 2021
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
4 changes: 3 additions & 1 deletion cassandra_migrate/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ def __init__(self, data, base_path):

self.keyspace = _assert_type(data, 'keyspace', str)

self.cluster_connection_properties = _assert_type(data, 'cluster_connection_properties', dict)

self.profiles = self.DEFAULT_PROFILES.copy()
profiles = _assert_type(data, 'profiles', dict, default={})
for name, profile in profiles.items():
Expand Down Expand Up @@ -116,4 +118,4 @@ def load(cls, path):
with open(path, 'r', encoding='utf-8') as f:
config = yaml.load(f, Loader=yaml.SafeLoader)

return cls(config, os.path.dirname(path))
return cls(config, os.path.dirname(path))
6 changes: 2 additions & 4 deletions cassandra_migrate/migrator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,8 @@ def __init__(self, config, profile='dev', hosts=['127.0.0.1'], port=9042,
contact_points=hosts,
port=port,
auth_provider=auth_provider,
max_schema_agreement_wait=300,
control_connection_timeout=10,
connect_timeout=30,
ssl_options=ssl_options)
ssl_options=ssl_options,
**config.cluster_connection_properties)

self._session = None

Expand Down