Join GitHub today
GitHub is home to over 20 million developers working together to host and review code, manage projects, and build software together.
Revert move of code from uniter to common #8155
Conversation
| @@ -18,7 +18,7 @@ import ( | ||
| "github.com/juju/juju/apiserver/params" | ||
| "github.com/juju/juju/cmd/modelcmd" | ||
| "github.com/juju/juju/network/ssh" | ||
| - unitdebug "github.com/juju/juju/worker/uniter/runner/debug" | ||
| + unitdebug "github.com/juju/juju/worker/common/runner/debug" |
axw
Nov 30, 2017
Member
as discussed, please revert this and we can move it if we implement debug-hooks for CAAS charms
| -type hookLogger struct { | ||
| +var logger = loggo.GetLogger("juju.worker.common.runner") | ||
| + | ||
| +// MewHookLogger creates a new hook logger. |
| "gopkg.in/tomb.v1" | ||
| - "github.com/juju/juju/worker/uniter/runner/context" | ||
| + "github.com/juju/juju/worker/common/runner" |
axw
Nov 30, 2017
Member
"runner" is far too generic without the context of uniter in the path. Maybe "charmrunner"?
wallyworld
changed the title from
Move some shared files and errors etc from worker uniter to worker common
to
Revert move of code from uniter to common
Nov 30, 2017
|
$$merge$$ |
|
Status: merge request accepted. Url: http://ci.jujucharms.com/job/github-merge-juju |
|
Build failed: Tests failed |
|
$$merge$$ |
|
Status: merge request accepted. Url: http://ci.jujucharms.com/job/github-merge-juju |
jujubot
merged commit c98b8c2
into
juju:develop
Nov 30, 2017
1 check failed
continuous-integration/jenkins/pr-merge
This commit cannot be built
Details
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
wallyworld commentedNov 30, 2017
Description of change
A previous PR extracted some hook command code from uniter and put it in a common package to share between the operator and uniter. However, it didn't work out because the Context objects used with the commands are different and can't easily be consolidated.
The PR reverts that change and also:
QA steps
bootstrap and deploy and relate some charms