diff options
| author | Zuul <zuul@review.opendev.org> | 2020-02-19 16:12:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-02-19 16:12:10 +0000 |
| commit | 6042050ee06a43431a9c7880f4e8a3ff95e02a09 (patch) | |
| tree | cac6633709d63d85e15617b189dae4d5bf3617e6 /zuul/cmd | |
| parent | bdda7192986edb5358eb1b211b359caa7c756baf (diff) | |
| parent | 7969b96a8651614d69126bbca812ccf87074863f (diff) | |
| download | zuul-6042050ee06a43431a9c7880f4e8a3ff95e02a09.tar.gz | |
Merge "gear: remove support for custom MASS_DO packet"
Diffstat (limited to 'zuul/cmd')
| -rwxr-xr-x | zuul/cmd/scheduler.py | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/zuul/cmd/scheduler.py b/zuul/cmd/scheduler.py index a2b6a1df5..82a589091 100755 --- a/zuul/cmd/scheduler.py +++ b/zuul/cmd/scheduler.py @@ -85,7 +85,7 @@ class Scheduler(zuul.cmd.ZuulDaemonApp): if child_pid == 0: os.close(pipe_write) self.setup_logging('gearman_server', 'log_config') - import zuul.lib.gearserver + import gear (statsd_host, statsd_port, statsd_prefix) = get_statsd_config( self.config) @@ -100,18 +100,18 @@ class Scheduler(zuul.cmd.ZuulDaemonApp): ssl_key = get_default(self.config, 'gearman_server', 'ssl_key') ssl_cert = get_default(self.config, 'gearman_server', 'ssl_cert') ssl_ca = get_default(self.config, 'gearman_server', 'ssl_ca') - zuul.lib.gearserver.GearServer(port, - ssl_key=ssl_key, - ssl_cert=ssl_cert, - ssl_ca=ssl_ca, - host=host, - statsd_host=statsd_host, - statsd_port=statsd_port, - statsd_prefix=statsd_prefix, - keepalive=True, - tcp_keepidle=300, - tcp_keepintvl=60, - tcp_keepcnt=5) + gear.Server(port, + ssl_key=ssl_key, + ssl_cert=ssl_cert, + ssl_ca=ssl_ca, + host=host, + statsd_host=statsd_host, + statsd_port=statsd_port, + statsd_prefix=statsd_prefix, + keepalive=True, + tcp_keepidle=300, + tcp_keepintvl=60, + tcp_keepcnt=5) # Keep running until the parent dies: pipe_read = os.fdopen(pipe_read) |