Get dashboard working and upgrade bootstrap. Note: the bootstrap fixes will be coming in the followup CL

buildman/manager/enterprise.py

@@ -25,6 +25,9 @@ class DynamicRegistrationComponent(BaseComponent):
     logger.debug('Registering new build component+worker with realm %s', realm)
     return realm
 
+  def kind(self):
+    return 'registration'
+
 
 class EnterpriseManager(BaseManager):
   """ Build manager implementation for the Enterprise Registry. """
@@ -82,5 +85,7 @@ class EnterpriseManager(BaseManager):
     if build_component in self.ready_components:
       self.ready_components.remove(build_component)
 
+    self.unregister_component(build_component)
+
   def num_workers(self):
     return len(self.all_components)

buildman/manager/ephemeral.py

@@ -271,8 +271,6 @@ class EphemeralBuilderManager(BaseManager):
 
   def build_component_disposed(self, build_component, timed_out):
     logger.debug('Calling build_component_disposed.')
-
-    # TODO make it so that I don't have to unregister the component if it timed out
     self.unregister_component(build_component)
 
   @coroutine

buildman/server.py

@@ -70,7 +70,8 @@ class BuilderServer(object):
 
     @controller_app.route('/status')
     def status():
-      (running_count, available_count) = server._queue.get_metrics()
+      metrics = server._queue.get_metrics(require_transaction=False)
+      (running_count, available_not_running_count, available_count) = metrics
 
       workers = [component for component in server._current_components
                            if component.kind() == 'builder']
@@ -80,7 +81,7 @@ class BuilderServer(object):
         'running_local': server._job_count,
         'running_total': running_count,
         'workers': len(workers),
-        'job_total': available_count
+        'job_total': available_count + running_count
       }
 
       return json.dumps(data)