summaryrefslogtreecommitdiff
path: root/zuul/web
diff options
context:
space:
mode:
authorFelix Edel <felix.edel@bmw.de>2021-11-09 13:01:47 +0100
committerFelix Edel <felix.edel@bmw.de>2021-11-10 09:49:48 +0100
commit3da368e4ea69478b67837486fb802781aa957fd3 (patch)
treef7398dc5ec691f87bcef9147947685c095019429 /zuul/web
parentb2d7d0b1c2d985692f16d3fa1827c11c1ddba989 (diff)
downloadzuul-3da368e4ea69478b67837486fb802781aa957fd3.tar.gz
Remove gearman from zuul-web
As all RPC calls are now migrated to Zookeeper, we can finally remove gearman from zuul-web. Change-Id: I7eab1c3318ce980d3df200238d302613143b5a1f
Diffstat (limited to 'zuul/web')
-rwxr-xr-xzuul/web/__init__.py13
1 files changed, 0 insertions, 13 deletions
diff --git a/zuul/web/__init__.py b/zuul/web/__init__.py
index b82c92ffa..75eba8fe3 100755
--- a/zuul/web/__init__.py
+++ b/zuul/web/__init__.py
@@ -53,7 +53,6 @@ from zuul.model import (
UnparsedAbideConfig,
WebInfo,
)
-import zuul.rpcclient
from zuul.version import get_version_string
from zuul.zk import ZooKeeperClient
from zuul.zk.components import ComponentRegistry, WebComponent
@@ -298,7 +297,6 @@ class ZuulWebAPI(object):
log = logging.getLogger("zuul.web")
def __init__(self, zuulweb):
- self.rpc = zuulweb.rpc
self.zk_client = zuulweb.zk_client
self.system = ZuulSystem(self.zk_client)
self.zk_nodepool = ZooKeeperNodepool(self.zk_client,
@@ -1633,16 +1631,6 @@ class ZuulWeb(object):
)
self.hostname = socket.getfqdn()
- gear_server = get_default(self.config, 'gearman', 'server')
- gear_port = get_default(self.config, 'gearman', 'port', 4730)
- ssl_key = get_default(self.config, 'gearman', 'ssl_key')
- ssl_cert = get_default(self.config, 'gearman', 'ssl_cert')
- ssl_ca = get_default(self.config, 'gearman', 'ssl_ca')
-
- # instanciate handlers
- self.rpc = zuul.rpcclient.RPCClient(gear_server, gear_port,
- ssl_key, ssl_cert, ssl_ca,
- client_id='Zuul Web Server')
self.zk_client = ZooKeeperClient.fromConfig(self.config)
self.zk_client.connect()
@@ -1889,7 +1877,6 @@ class ZuulWeb(object):
def stop(self):
self.log.debug("ZuulWeb stopping")
self.component_info.state = self.component_info.STOPPED
- self.rpc.shutdown()
cherrypy.engine.exit()
# Not strictly necessary, but without this, if the server is
# started again (e.g., in the unit tests) it will reuse the