Launchpad itself

Merge lp:~cjwatson/launchpad/buildd-manager-feature-controller into lp:launchpad

  1. buildd-manager-feature-controller
  2. Merge into devel
Proposed by Colin Watson
Status: Merged
Merged at revision: 18532
Proposed branch: lp:~cjwatson/launchpad/buildd-manager-feature-controller
Merge into: lp:launchpad
Diff against target: 24 lines (+5/-1)
1 file modified
daemons/buildd-manager.tac (+5/-1)
To merge this branch: bzr merge lp:~cjwatson/launchpad/buildd-manager-feature-controller
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+336018@code.launchpad.net

Commit message

Set up a feature controller for buildd-manager.

Description of the change

We can't use feature rules otherwise.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'daemons/buildd-manager.tac'
2--- daemons/buildd-manager.tac 2016-05-25 15:33:28 +0000
3+++ daemons/buildd-manager.tac 2018-01-12 00:12:08 +0000
4@@ -1,4 +1,4 @@
5-# Copyright 2009-2016 Canonical Ltd. This software is licensed under the
6+# Copyright 2009-2018 Canonical Ltd. This software is licensed under the
7 # GNU Affero General Public License version 3 (see the file LICENSE).
8
9 # Twisted Application Configuration file.
10@@ -17,6 +17,7 @@
11 from lp.services.scripts import execute_zcml_for_scripts
12 from lp.buildmaster.manager import BuilddManager
13 from lp.services.mail.sendmail import set_immediate_mail_delivery
14+from lp.services.twistedsupport.features import setup_feature_controller
15 from lp.services.twistedsupport.loggingsupport import RotatableFileLogObserver
16
17 execute_zcml_for_scripts()
18@@ -44,3 +45,6 @@
19 # Service for scanning buildd slaves.
20 service = BuilddManager()
21 service.setServiceParent(application)
22+
23+# Allow use of feature flags.
24+setup_feature_controller('buildd-manager')