Skip to content
This repository was archived by the owner on Feb 24, 2025. It is now read-only.

Fix default type check #500

Merged
jeremycline merged 5 commits into from
Jan 15, 2018
Merged

Fix default type check #500

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
52d00b8
fix: Use int validator for ca and crl cache expiry
sijis Jan 8, 2018
aaa5491
fix: Give expiry keys sane defaults
sijis Jan 8, 2018
6592dde
test: Update expiry defaults
sijis Jan 12, 2018
377fe4f
fix: Update relay_inbound references to use str
sijis Jan 12, 2018
32e6e05
fix: Set crl_cache_expiry to a better default
sijis Jan 12, 2018
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
5 changes: 2 additions & 3 deletions doc/configuration.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,8 @@ playback if needed.

relay_inbound
-------------
``str`` - A list of special zeromq endpoints where the inbound,
passive zmq SUB sockets for for instances of ``fedmsg-relay`` are
listening.
``str`` - A special zeromq endpoint where the inbound, passive zmq SUB
sockets for instances of ``fedmsg-relay`` are listening.

Commands like ``fedmsg-logger`` actively connect here and publish their
messages.
Expand Down
4 changes: 1 addition & 3 deletions doc/deployment.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,7 @@ that it looks something like this:
"tcp://hostA:4001",
],
},
relay_inbound=[
"tcp://hostA:2003",
],
relay_inbound = "tcp://hostA:2003",
)

To confirm that something's not immediately broken, you can go through the
Expand Down
4 changes: 1 addition & 3 deletions fedmsg.d/relay.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,5 @@
# It is also used by the git-hook, for the same reason.
# It is also used by the mediawiki php plugin which, due to the oddities of
# php, can't maintain a single passive-bind endpoint of it's own.
relay_inbound=[
"tcp://127.0.0.1:2003",
],
relay_inbound="tcp://127.0.0.1:2003",
)
8 changes: 4 additions & 4 deletions fedmsg/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,8 +294,8 @@ class FedmsgConfig(dict):
'validator': _validate_none_or_type(six.text_type),
},
'crl_cache_expiry': {
'default': None,
'validator': _validate_none_or_type(six.text_type),
'default': 10,
Copy link
Member

@jeremycline jeremycline Jan 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The docs say this is in seconds (although the docs are a little unreliable) so 10 is a really small default for a CRL. Maybe an hour is more reasonable?

Copy link
Contributor Author

@sijis sijis Jan 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. Updating...

Copy link
Member

@jeremycline jeremycline Jan 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you missed updating it in a few places? Additionally, an hour would be 60*60 (3600) since this is seconds, not minutes.

Copy link
Contributor Author

@sijis sijis Jan 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't want to to expire in 1 minute? 😂
Let me try this again.

Copy link
Contributor Author

@sijis sijis Jan 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Totally missed several spots.
Alright I think it finally got this.
Also, sorry for the constant rebasing. Just trying to keep clean commits.

'validator': _validate_non_negative_int,
},
'ca_cert_location': {
'default': u'/etc/pki/fedmsg/ca.crt',
Expand All @@ -306,8 +306,8 @@ class FedmsgConfig(dict):
'validator': _validate_none_or_type(six.text_type),
},
'ca_cert_cache_expiry': {
'default': None,
'validator': _validate_none_or_type(six.text_type),
'default': 0,
'validator': _validate_non_negative_int,
},
'certnames': {
'default': {},
Expand Down
2 changes: 1 addition & 1 deletion fedmsg/tests/fedmsg-test-config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
# Guarantee that we don't fall over with a bogus endpoint.
"blah.%s": "tcp://www.flugle.horn:88",
},
relay_inbound=["tcp://127.0.0.1:%i" % (port - 1)],
relay_inbound="tcp://127.0.0.1:%i" % (port - 1),
replay_endpoints={
'unittest.%s' % hostname: "tcp://127.0.0.1:%i" % (port + 1),
'unittest2.%s' % hostname: "tcp://127.0.0.1:%i" % (port + 2),
Expand Down
4 changes: 2 additions & 2 deletions fedmsg/tests/test_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,10 @@ class FedmsgConfigTests(unittest.TestCase):
'ssldir': '/etc/pki/fedmsg',
'crl_location': None,
'crl_cache': None,
'crl_cache_expiry': None,
'crl_cache_expiry': 10,
'ca_cert_location': '/etc/pki/fedmsg/ca.crt',
'ca_cert_cache': None,
'ca_cert_cache_expiry': None,
'ca_cert_cache_expiry': 0,
'certnames': {},
'routing_policy': {},
'routing_nitpicky': False,
Expand Down