Merge "Required SQL reporters"
This commit is contained in:
@@ -164,9 +164,11 @@ class ZuulApp(object):
|
||||
logging_config.setDebug()
|
||||
logging_config.apply()
|
||||
|
||||
def configure_connections(self, source_only=False, include_drivers=None):
|
||||
def configure_connections(self, source_only=False, include_drivers=None,
|
||||
require_sql=False):
|
||||
self.connections = zuul.lib.connections.ConnectionRegistry()
|
||||
self.connections.configure(self.config, source_only, include_drivers)
|
||||
self.connections.configure(self.config, source_only, include_drivers,
|
||||
require_sql)
|
||||
|
||||
|
||||
class ZuulDaemonApp(ZuulApp, metaclass=abc.ABCMeta):
|
||||
|
||||
@@ -160,7 +160,7 @@ class Scheduler(zuul.cmd.ZuulDaemonApp):
|
||||
tls_key=zookeeper_tls_key,
|
||||
tls_ca=zookeeper_tls_ca)
|
||||
|
||||
self.configure_connections()
|
||||
self.configure_connections(require_sql=True)
|
||||
self.sched.setExecutor(gearman)
|
||||
self.sched.setMerger(merger)
|
||||
self.sched.setNodepool(nodepool)
|
||||
|
||||
@@ -124,7 +124,8 @@ class WebServer(zuul.cmd.ZuulDaemonApp):
|
||||
include_drivers=[zuul.driver.sql.SQLDriver,
|
||||
zuul.driver.github.GithubDriver,
|
||||
zuul.driver.pagure.PagureDriver,
|
||||
zuul.driver.gitlab.GitlabDriver])
|
||||
zuul.driver.gitlab.GitlabDriver],
|
||||
require_sql=True)
|
||||
self.configure_authenticators()
|
||||
self._run()
|
||||
except Exception:
|
||||
|
||||
Reference in New Issue
Block a user