beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename "log_event" to "log"

Browse source 
Signed-off-by: Solomon Hykes <solomon@docker.com>
This commit is contained in:
Solomon Hykes 2014-08-06 09:28:30 +00:00
parent 8d056423f8
commit 1c11d7f93e
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/container.go
View file

@ -170,7 +170,7 @@ func (container *Container) WriteHostConfig() error {
func (container *Container) LogEvent(action string) { func (container *Container) LogEvent(action string) {
d := container.daemon d := container.daemon
if err := d.eng.Job("log_event", action, container.ID, d.Repositories().ImageName(container.Image)).Run(); err != nil { if err := d.eng.Job("log", action, container.ID, d.Repositories().ImageName(container.Image)).Run(); err != nil {
utils.Errorf("Error running container: %s", err) utils.Errorf("Error running container: %s", err)
} }
} }

4
daemon/image_delete.go
View file

@ -93,7 +93,7 @@ func (daemon *Daemon) DeleteImage(eng *engine.Engine, name string, imgs *engine.
out := &engine.Env{} out := &engine.Env{}
out.Set("Untagged", repoName+":"+tag) out.Set("Untagged", repoName+":"+tag)
imgs.Add(out) imgs.Add(out)
eng.Job("log_event", "untag", img.ID, "").Run() eng.Job("log", "untag", img.ID, "").Run()
} }
} }
tags = daemon.Repositories().ByID()[img.ID] tags = daemon.Repositories().ByID()[img.ID]
@ -111,7 +111,7 @@ func (daemon *Daemon) DeleteImage(eng *engine.Engine, name string, imgs *engine.
out := &engine.Env{} out := &engine.Env{}
out.Set("Deleted", img.ID) out.Set("Deleted", img.ID)
imgs.Add(out) imgs.Add(out)
eng.Job("log_event", "delete", img.ID, "").Run() eng.Job("log", "delete", img.ID, "").Run()
if img.Parent != "" && !noprune { if img.Parent != "" && !noprune {
err := daemon.DeleteImage(eng, img.Parent, imgs, false, force, noprune) err := daemon.DeleteImage(eng, img.Parent, imgs, false, force, noprune)
if first { if first {

2
events/events.go
View file

@ -30,7 +30,7 @@ func (e *Events) Install(eng *engine.Engine) error {
// Here you should describe public interface // Here you should describe public interface
jobs := map[string]engine.Handler{ jobs := map[string]engine.Handler{
"events": e.Get, "events": e.Get,
"log_event": e.Log, "log": e.Log,
"subscribers_count": e.SubscribersCount, "subscribers_count": e.SubscribersCount,
} }
for name, job := range jobs { for name, job := range jobs {

2
events/events_test.go
View file

@ -88,7 +88,7 @@ func TestLogEvents(t *testing.T) {
action := fmt.Sprintf("action_%d", i) action := fmt.Sprintf("action_%d", i)
id := fmt.Sprintf("cont_%d", i) id := fmt.Sprintf("cont_%d", i)
from := fmt.Sprintf("image_%d", i) from := fmt.Sprintf("image_%d", i)
job := eng.Job("log_event", action, id, from) job := eng.Job("log", action, id, from)
if err := job.Run(); err != nil { if err := job.Run(); err != nil {
t.Fatal(err) t.Fatal(err)
} }