Browse code

Rename "log_event" to "log"

Signed-off-by: Solomon Hykes <solomon@docker.com>

Solomon Hykes authored on 2014/08/06 18:28:30
Showing 4 changed files
... ...
@@ -170,7 +170,7 @@ func (container *Container) WriteHostConfig() error {
170 170
 
171 171
 func (container *Container) LogEvent(action string) {
172 172
 	d := container.daemon
173
-	if err := d.eng.Job("log_event", action, container.ID, d.Repositories().ImageName(container.Image)).Run(); err != nil {
173
+	if err := d.eng.Job("log", action, container.ID, d.Repositories().ImageName(container.Image)).Run(); err != nil {
174 174
 		utils.Errorf("Error running container: %s", err)
175 175
 	}
176 176
 }
... ...
@@ -93,7 +93,7 @@ func (daemon *Daemon) DeleteImage(eng *engine.Engine, name string, imgs *engine.
93 93
 			out := &engine.Env{}
94 94
 			out.Set("Untagged", repoName+":"+tag)
95 95
 			imgs.Add(out)
96
-			eng.Job("log_event", "untag", img.ID, "").Run()
96
+			eng.Job("log", "untag", img.ID, "").Run()
97 97
 		}
98 98
 	}
99 99
 	tags = daemon.Repositories().ByID()[img.ID]
... ...
@@ -111,7 +111,7 @@ func (daemon *Daemon) DeleteImage(eng *engine.Engine, name string, imgs *engine.
111 111
 			out := &engine.Env{}
112 112
 			out.Set("Deleted", img.ID)
113 113
 			imgs.Add(out)
114
-			eng.Job("log_event", "delete", img.ID, "").Run()
114
+			eng.Job("log", "delete", img.ID, "").Run()
115 115
 			if img.Parent != "" && !noprune {
116 116
 				err := daemon.DeleteImage(eng, img.Parent, imgs, false, force, noprune)
117 117
 				if first {
... ...
@@ -30,7 +30,7 @@ func (e *Events) Install(eng *engine.Engine) error {
30 30
 	// Here you should describe public interface
31 31
 	jobs := map[string]engine.Handler{
32 32
 		"events":            e.Get,
33
-		"log_event":         e.Log,
33
+		"log":               e.Log,
34 34
 		"subscribers_count": e.SubscribersCount,
35 35
 	}
36 36
 	for name, job := range jobs {
... ...
@@ -88,7 +88,7 @@ func TestLogEvents(t *testing.T) {
88 88
 		action := fmt.Sprintf("action_%d", i)
89 89
 		id := fmt.Sprintf("cont_%d", i)
90 90
 		from := fmt.Sprintf("image_%d", i)
91
-		job := eng.Job("log_event", action, id, from)
91
+		job := eng.Job("log", action, id, from)
92 92
 		if err := job.Run(); err != nil {
93 93
 			t.Fatal(err)
94 94
 		}