Merge lp://staging/~ted/ubuntu-app-launch/jobs-helpers into lp://staging/ubuntu-app-launch

Proposed by Ted Gould
Status: Merged
Approved by: Ted Gould
Approved revision: 346
Merged at revision: 302
Proposed branch: lp://staging/~ted/ubuntu-app-launch/jobs-helpers
Merge into: lp://staging/ubuntu-app-launch
Prerequisite: lp://staging/~ted/ubuntu-app-launch/app-store
Diff against target: 3242 lines (+1100/-1406)
22 files modified
CMakeLists.txt (+1/-41)
debian/changelog (+6/-0)
docs/index.rst (+12/-3)
libubuntu-app-launch/CMakeLists.txt (+4/-2)
libubuntu-app-launch/helper-impl-click.cpp (+0/-176)
libubuntu-app-launch/helper-impl-click.h (+0/-62)
libubuntu-app-launch/helper-impl.h (+80/-0)
libubuntu-app-launch/helper.cpp (+0/-36)
libubuntu-app-launch/helper.h (+6/-0)
libubuntu-app-launch/jobs-base.cpp (+257/-4)
libubuntu-app-launch/jobs-base.h (+48/-8)
libubuntu-app-launch/jobs-systemd.cpp (+24/-52)
libubuntu-app-launch/jobs-systemd.h (+11/-12)
libubuntu-app-launch/jobs-upstart.cpp (+49/-69)
libubuntu-app-launch/jobs-upstart.h (+19/-20)
libubuntu-app-launch/registry.cpp (+28/-8)
libubuntu-app-launch/registry.h (+31/-0)
libubuntu-app-launch/ubuntu-app-launch.cpp (+219/-908)
tests/snappy-xmir-test.sh.in (+3/-3)
tests/xmir-helper-test.in (+2/-2)
utils/CMakeLists.txt (+56/-0)
utils/systemd-helper-helper.c (+244/-0)
To merge this branch: bzr merge lp://staging/~ted/ubuntu-app-launch/jobs-helpers
Reviewer Review Type Date Requested Status
unity-api-1-bot continuous-integration Needs Fixing
Charles Kerr (community) Approve
Review via email: mp+318310@code.staging.launchpad.net

This proposal supersedes a proposal from 2017-02-22.

Commit message

Moving untrusted helpers over to the jobs objects.

Description of the change

This moves the helper code over to using jobs objects so that they're not using Upstart directly. There were a few changes required in the jobs objects as a result to clean them up so they're not entirely application focused.

The tests do not work on this branch. As we're breaking all the upstart and click stuff all the tests are fixed at the rm-rf-click branch and these should land together.

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

LGTM.

I /do/ like the mechanism you're using to lazy-wire up the signal backends when client code asks for the core::Signal. In general this jobs management is an improvement over the previous code.

review: Approve
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Ted Gould (ted) wrote :

On Mon, 2017-03-20 at 23:14 +0000, Charles Kerr wrote:
> (Minor) Under what conditions would the job not be in allJobs? Does
> this warrant logging an error? (here and below)
So, I see why you're confused. It shouldn't be "allJobs" it should be
"allApplicationJobs". The helpers have a job name based on the type. So
since this signal is for application start/stopped it filters out the
helpers. I'm thinking we can clean this up in the future, but it's just
a direct port from the Upstart application jobs that we had. We can
probably simplify it a bit now that we're dropping the Upstart backend.
Fixed r346

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches