Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Forward port of pull request #2258 from natefinch/fix-1452285 #2303

Merged
merged 2 commits into from May 13, 2015
Merged

Forward port of pull request #2258 from natefinch/fix-1452285 #2303

merged 2 commits into from May 13, 2015

Conversation

natefinch
Copy link
Contributor

Foward port from PR #2258

revamp log rotation

This fixes https://bugs.launchpad.net/juju-core/+bug/1452285

The problem was that we had moved the log rotation code earlier in the startup code, and then other code overwrote what loggo used as a default writer. This code consolidates the loggo-modification code to a single place, so we don't have to worry about that anymore.

(Review request: http://reviews.vapour.ws/r/1619/)
Conflicts:
agent/agent.go
cmd/jujud/agent/agent.go
cmd/jujud/agent/agent_test.go
cmd/jujud/agent/machine_test.go

(Review request: http://reviews.vapour.ws/r/1666/)

jujubot and others added 2 commits May 12, 2015 21:55
Foward port from PR #2258

revamp log rotation

This fixes https://bugs.launchpad.net/juju-core/+bug/1452285

The problem was that we had moved the log rotation code earlier in the startup code, and then other code overwrote what loggo used as a default writer.  This code consolidates the loggo-modification code to a single place, so we don't have to worry about that anymore.

(Review request: http://reviews.vapour.ws/r/1619/)
Conflicts:
	agent/agent.go
	cmd/jujud/agent/agent.go
	cmd/jujud/agent/agent_test.go
	cmd/jujud/agent/machine_test.go
@natefinch
Copy link
Contributor Author

$$merge$$

@jujubot
Copy link
Collaborator

jujubot commented May 13, 2015

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

jujubot added a commit that referenced this pull request May 13, 2015
Forward port of pull request #2258 from natefinch/fix-1452285

Foward port from PR #2258

revamp log rotation

This fixes https://bugs.launchpad.net/juju-core/+bug/1452285

The problem was that we had moved the log rotation code earlier in the startup code, and then other code overwrote what loggo used as a default writer.  This code consolidates the loggo-modification code to a single place, so we don't have to worry about that anymore.

(Review request: http://reviews.vapour.ws/r/1619/)
Conflicts:
	agent/agent.go
	cmd/jujud/agent/agent.go
	cmd/jujud/agent/agent_test.go
	cmd/jujud/agent/machine_test.go

(Review request: http://reviews.vapour.ws/r/1666/)
@jujubot jujubot merged commit 43690a1 into juju:1.24 May 13, 2015
jujubot added a commit that referenced this pull request May 13, 2015
Merge pull request #2303 from natefinch/fix-1452285-1.24

Forward port of pull request #2303 from natefinch/fix-1452285-1.24

revamp log rotation

This fixes https://bugs.launchpad.net/juju-core/+bug/1452285

The problem was that we had moved the log rotation code earlier in the startup code, and then other code overwrote what loggo used as a default writer.  This code consolidates the loggo-modification code to a single place, so we don't have to worry about that anymore.


(Review request: http://reviews.vapour.ws/r/1668/)
@natefinch natefinch deleted the fix-1452285-1.24 branch June 3, 2015 20:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants