Skip to content

Commit

Permalink
allow Buildbot to run without buildbot-www, if no c['www']['port'] is…
Browse files Browse the repository at this point in the history
… present
  • Loading branch information
djmitche committed Dec 1, 2014
1 parent 367acfd commit da86615
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions master/buildbot/www/service.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@ def __init__(self, master):
# load the apps early, in case something goes wrong in Python land
self.apps = get_plugins('www', None, load_now=True)

if 'base' not in self.apps:
raise RuntimeError("could not find buildbot-www; is it installed?")

@property
def auth(self):
return self.master.config.www['auth']
Expand Down Expand Up @@ -104,6 +101,9 @@ def keep(port):

yield self.port_service.setServiceParent(self)

if not self.port_service:
log.msg("No web server configured on this master")

yield service.ReconfigurableServiceMixin.reconfigServiceWithBuildbotConfig(self,
new_config)

Expand All @@ -115,6 +115,11 @@ def getPortnum(self):

def setupSite(self, new_config):
self.reconfigurableResources = []

# we're going to need at least the the base plugin (buildbot-www)
if 'base' not in self.apps:
raise RuntimeError("could not find buildbot-www; is it installed?")

root = self.apps.get('base').resource
for key, plugin in new_config.www.get('plugins', {}).items():
if key not in self.apps:
Expand Down

0 comments on commit da86615

Please sign in to comment.