Skip to content

Commit

Permalink
B2: Handle backend options type conversions (s3ql#238)
Browse files Browse the repository at this point in the history
Fixes s3ql#237
  • Loading branch information
d--j authored Jan 10, 2021
1 parent f4bd476 commit c61b8ca
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
5 changes: 5 additions & 0 deletions Changes.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
UNRELEASED CHANGES

* The tcp-timeout backend option of the B2 Backend works now.


2021-01-03, S3Ql 3.7.0

* S3QL now requires Python 3.7 or newer.
Expand Down
12 changes: 6 additions & 6 deletions src/s3ql/backends/b2/b2_backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,17 @@ def __init__(self, options):
self.b2_application_key_id = options.backend_login
self.b2_application_key = options.backend_password

self.tcp_timeout = self.options.get('tcp-timeout', 20)
self.tcp_timeout = int(self.options.get('tcp-timeout', 20))

self.account_id = None

self.disable_versions = self.options.get('disable-versions', False)
self.retry_on_cap_exceeded = self.options.get('retry-on-cap-exceeded', False)
self.disable_versions = 'disable-versions' in self.options
self.retry_on_cap_exceeded = 'retry-on-cap-exceeded' in self.options

# Test modes
self.test_mode_fail_some_uploads = self.options.get('test-mode-fail-some-uploads', False)
self.test_mode_expire_some_tokens = self.options.get('test-mode-expire-some-tokens', False)
self.test_mode_force_cap_exceeded = self.options.get('test-mode-force-cap-exceeded', False)
self.test_mode_fail_some_uploads = 'test-mode-fail-some-uploads' in self.options
self.test_mode_expire_some_tokens = 'test-mode-expire-some-tokens' in self.options
self.test_mode_force_cap_exceeded = 'test-mode-force-cap-exceeded' in self.options

(bucket_name, prefix) = self._parse_storage_url(options.storage_url, self.ssl_context)
self.bucket_name = bucket_name
Expand Down

0 comments on commit c61b8ca

Please sign in to comment.