fix: add more events

Signed-off-by: zhangyue <[email protected]>

Author: zhangyue

daemon/mgr/container.go

@@ -982,6 +982,8 @@ func (mgr *ContainerManager) Restart(ctx context.Context, name string, timeout i
 	c.RestartCount++
 
 	logrus.Debugf("container %s restartCount is %d", c.ID, c.RestartCount)
+	mgr.LogContainerEvent(ctx, c, "restart")
+
 	return c.Write(mgr.Store)
 }
 
@@ -1451,6 +1453,7 @@ func (mgr *ContainerManager) Top(ctx context.Context, name string, psArgs string
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed parsePSOutput")
 	}
+	mgr.LogContainerEvent(ctx, c, "top")
 
 	return procList, nil
 }
@@ -1469,6 +1472,7 @@ func (mgr *ContainerManager) Resize(ctx context.Context, name string, opts types
 		return fmt.Errorf("failed to resize container %s: container is not running", c.ID)
 	}
 
+	mgr.LogContainerEvent(ctx, c, "resize")
 	return mgr.Client.ResizeContainer(ctx, c.ID, opts)
 }
 

daemon/mgr/container_commit.go

@@ -80,6 +80,7 @@ func (mgr *ContainerManager) Commit(ctx context.Context, name string, options *t
 		// pouch can see the new image reference.
 		logrus.Warnf("failed to update image store: %s", err)
 	}
+	mgr.LogContainerEvent(ctx, c, "commit")
 
 	// return 12 bits image id as a result
 	imageID := imageDigest.Hex()

daemon/mgr/container_copy.go

@@ -154,6 +154,7 @@ func (mgr *ContainerManager) ArchivePath(ctx context.Context, name, path string)
 		c.Unlock()
 		return err
 	})
+	mgr.LogContainerEvent(ctx, c, "archive-path")
 
 	return content, stat, nil
 }
@@ -224,6 +225,8 @@ func (mgr *ContainerManager) ExtractToDir(ctx context.Context, name, path string
 		NoOverwriteDirNonDir: noOverwriteDirNonDir,
 	}
 
+	mgr.LogContainerEvent(ctx, c, "extract-to-dir")
+
 	return chrootarchive.Untar(content, resolvedPath, opts)
 }
 

daemon/mgr/container_exec.go

@@ -43,7 +43,7 @@ func (mgr *ContainerManager) CreateExec(ctx context.Context, name string, config
 	}
 
 	mgr.ExecProcesses.Put(execid, execConfig)
-
+	mgr.LogContainerEvent(ctx, c, "exec_create")
 	return execid, nil
 }
 
@@ -165,6 +165,7 @@ func (mgr *ContainerManager) StartExec(ctx context.Context, execid string, cfg *
 	}, timeout); err != nil {
 		return err
 	}
+	mgr.LogContainerEvent(ctx, c, "exec_start")
 	return <-attachErrCh
 }
 

daemon/mgr/image.go

@@ -270,7 +270,7 @@ func (mgr *ImageManager) PushImage(ctx context.Context, name, tag string, authCo
 	} else {
 		ref = reference.WithTag(ref, tag)
 	}
-
+	mgr.LogImageEvent(ctx, ref.String(), ref.String(), "push")
 	return mgr.client.PushImage(ctx, ref.String(), authConfig, out)
 }
 
@@ -465,7 +465,7 @@ func (mgr *ImageManager) RemoveImage(ctx context.Context, idOrRef string, force
 		// the searchable reference has different locator without force.
 		// It's different reference from locator aspect.
 		if !force && !uniqueLocatorReference(mgr.localStore.GetReferences(id)) {
-			return fmt.Errorf("Unable to remove the image %q (must force) - image has serveral references", idOrRef)
+			return fmt.Errorf("unable to remove the image %q (must force) - image has serveral references", idOrRef)
 		}
 
 		for _, ref := range mgr.localStore.GetPrimaryReferences(id) {
@@ -486,7 +486,7 @@ func (mgr *ImageManager) RemoveImage(ctx context.Context, idOrRef string, force
 		if err := mgr.localStore.RemoveReference(id, primaryRef); err != nil {
 			return err
 		}
-
+		mgr.LogImageEvent(ctx, namedRef.String(), namedRef.String(), "delete")
 		return mgr.client.RemoveImage(ctx, primaryRef.String())
 	}
 
@@ -537,6 +537,7 @@ func (mgr *ImageManager) AddTag(ctx context.Context, sourceImage string, targetT
 		Name:   tagRef.String(),
 		Target: ctrdImg.Target(),
 	})
+	mgr.LogImageEvent(ctx, sourceImage, tagRef.String(), "tag")
 	return err
 }
 

daemon/mgr/image_load.go

@@ -62,5 +62,6 @@ func (mgr *ImageManager) LoadImage(ctx context.Context, imageName string, tarstr
 	if merrs.Size() != 0 {
 		return fmt.Errorf("fails to load image: %v", merrs.Error())
 	}
+	mgr.LogImageEvent(ctx, imageName, imageName, "load")
 	return nil
 }

daemon/mgr/image_save.go

@@ -18,6 +18,7 @@ func (mgr *ImageManager) SaveImage(ctx context.Context, idOrRef string) (io.Read
 	if err != nil {
 		return nil, err
 	}
+	mgr.LogImageEvent(ctx, idOrRef, ref.String(), "save")
 
 	return exportedStream, nil
 }

daemon/mgr/volume.go

@@ -185,6 +185,7 @@ func (vm *VolumeManager) Attach(ctx context.Context, name string, options map[st
 		}
 	}
 
+	vm.LogVolumeEvent(ctx, name, "attach", map[string]string{"driver": v.Driver()})
 	return vm.core.AttachVolume(id, options)
 }
 
@@ -220,6 +221,6 @@ func (vm *VolumeManager) Detach(ctx context.Context, name string, options map[st
 			}
 		}
 	}
-
+	vm.LogVolumeEvent(ctx, name, "detach", map[string]string{"driver": v.Driver()})
 	return vm.core.DetachVolume(id, options)
 }

test/cli_events_test.go

@@ -89,11 +89,19 @@ func (suite *PouchEventsSuite) TestExecDieEventWorks(c *check.C) {
 
 	// check output contains exec_die event
 	lines := delEmptyStrInSlice(strings.Split(output, "\n"))
-	if len(lines) != 1 {
+	if len(lines) != 3 {
 		c.Errorf("unexpected output %s: should just contains 1 line", output)
 	}
 
-	if err := checkContainerEvent(lines[0], "exec_die"); err != nil {
+	if err := checkContainerEvent(lines[0], "exec_create"); err != nil {
+		c.Errorf("exec_create event check error: %v", err)
+	}
+
+	if err := checkContainerEvent(lines[1], "exec_start"); err != nil {
+		c.Errorf("exec_start event check error: %v", err)
+	}
+
+	if err := checkContainerEvent(lines[2], "exec_die"); err != nil {
 		c.Errorf("exec_die event check error: %v", err)
 	}
 }