Skip to content

Cleanup: combine image + events refactor#7452

Merged
shykes merged 12 commits intomoby:masterfrom
shykes:7370-on-7427
Aug 7, 2014
Merged

Cleanup: combine image + events refactor#7452
shykes merged 12 commits intomoby:masterfrom
shykes:7370-on-7427

Conversation

@shykes
Copy link
Copy Markdown
Contributor

@shykes shykes commented Aug 6, 2014

This is #7370 rebased on top of #7427, ready for review.

Solomon Hykes and others added 12 commits August 6, 2014 10:08
Signed-off-by: Solomon Hykes <solomon@docker.com>
Signed-off-by: Solomon Hykes <solomon@docker.com>
Signed-off-by: Solomon Hykes <solomon@docker.com>
Signed-off-by: Solomon Hykes <solomon@docker.com>
Signed-off-by: Solomon Hykes <solomon@docker.com>
Signed-off-by: Solomon Hykes <solomon@docker.com>
Signed-off-by: Solomon Hykes <solomon@docker.com>
Note: this cannot yet be moved to graph/ because of a lingering
dependency on daemon. This has been noted in a FIXME.

Signed-off-by: Solomon Hykes <solomon@docker.com>
Note: these 2 jobs should be merged into one. This was noted in a FIXME.

Signed-off-by: Solomon Hykes <solomon@docker.com>
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Signed-off-by: Tibor Vass <teabee89@gmail.com>
* Events subsystem merged from `server/events.go` and
  `utils/jsonmessagepublisher.go` and moved to `events/events.go`
* Only public interface for this subsystem is engine jobs
* There is two new engine jobs - `log_event` and `subscribers_count`
* There is auxiliary function `container.LogEvent` for logging events for
  containers

Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
[solomon@docker.com: resolve merge conflicts]
Signed-off-by: Solomon Hykes <solomon@docker.com>
@tiborvass
Copy link
Copy Markdown
Contributor

Needs a gofmt on Rename "log_event" to "log" 9cbb811.

@shykes
Copy link
Copy Markdown
Contributor Author

shykes commented Aug 6, 2014

Fixed gofmt

@tiborvass
Copy link
Copy Markdown
Contributor

LGTM

This was referenced Aug 6, 2014
@shykes
Copy link
Copy Markdown
Contributor Author

shykes commented Aug 7, 2014

I need a 2nd pair of eyes on this... Thanks!

@crosbymichael
Copy link
Copy Markdown
Contributor

LGTM

Merge when you are ready

@shykes
Copy link
Copy Markdown
Contributor Author

shykes commented Aug 7, 2014

brentdance

shykes pushed a commit that referenced this pull request Aug 7, 2014
Cleanup: move image management and logging out of deprecated Server
@shykes shykes merged commit 7e12911 into moby:master Aug 7, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants