diff options
| author | Paul Belanger <pabelanger@redhat.com> | 2017-10-05 16:04:27 -0400 |
|---|---|---|
| committer | Paul Belanger <pabelanger@redhat.com> | 2017-10-05 16:32:44 -0400 |
| commit | edadfed2568f48fbe1be4b6c5560075e08340a07 (patch) | |
| tree | e0ee08502d862134f29b463524cab8e583463921 /zuul/merger/server.py | |
| parent | 06ab26d80cdbde498cfb61d57f627632d24b70f9 (diff) | |
| download | zuul-edadfed2568f48fbe1be4b6c5560075e08340a07.tar.gz | |
Create git_http_low_speed_limit / git_http_low_speed_time
Expose 2 new settings to zuul.conf allowing an operator better
control over them. By default we set the speed limit to 1000 bytes
and speed time to 30 seconds.
Change-Id: I9da80fcfc312cbc12ea11ee7284eaec23adb97c9
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
Diffstat (limited to 'zuul/merger/server.py')
| -rw-r--r-- | zuul/merger/server.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/zuul/merger/server.py b/zuul/merger/server.py index 881209d65..765d9e0ba 100644 --- a/zuul/merger/server.py +++ b/zuul/merger/server.py @@ -33,9 +33,13 @@ class MergeServer(object): '/var/lib/zuul/merger-git') merge_email = get_default(self.config, 'merger', 'git_user_email') merge_name = get_default(self.config, 'merger', 'git_user_name') - - self.merger = merger.Merger(merge_root, connections, merge_email, - merge_name) + speed_limit = get_default( + config, 'merger', 'git_http_low_speed_limit', '1000') + speed_time = get_default( + config, 'merger', 'git_http_low_speed_time', '30') + self.merger = merger.Merger( + merge_root, connections, merge_email, merge_name, speed_limit, + speed_time) def start(self): self._running = True |