summaryrefslogtreecommitdiff
path: root/daemon/archive.go
diff options
context:
space:
mode:
authorDavid Calavera <david.calavera@gmail.com>2015-12-21 19:45:31 -0500
committerDavid Calavera <david.calavera@gmail.com>2015-12-30 17:39:33 -0500
commit9d12d093009d3c4bf3bd4ebad3f8327c36d2d584 (patch)
treec0951294f83219fb04125920e496dc4541414921 /daemon/archive.go
parent72f1881df102fce9ad31e98045b91c204dd44513 (diff)
downloaddocker-9d12d093009d3c4bf3bd4ebad3f8327c36d2d584.tar.gz
Add volume events.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Diffstat (limited to 'daemon/archive.go')
-rw-r--r--daemon/archive.go12
1 files changed, 6 insertions, 6 deletions
diff --git a/daemon/archive.go b/daemon/archive.go
index de329741c2..1c3cec0e9d 100644
--- a/daemon/archive.go
+++ b/daemon/archive.go
@@ -84,7 +84,7 @@ func (daemon *Daemon) containerStatPath(container *container.Container, path str
defer daemon.Unmount(container)
err = daemon.mountVolumes(container)
- defer container.UnmountVolumes(true)
+ defer container.UnmountVolumes(true, daemon.LogVolumeEvent)
if err != nil {
return nil, err
}
@@ -119,7 +119,7 @@ func (daemon *Daemon) containerArchivePath(container *container.Container, path
defer func() {
if err != nil {
// unmount any volumes
- container.UnmountVolumes(true)
+ container.UnmountVolumes(true, daemon.LogVolumeEvent)
// unmount the container's rootfs
daemon.Unmount(container)
}
@@ -154,7 +154,7 @@ func (daemon *Daemon) containerArchivePath(container *container.Container, path
content = ioutils.NewReadCloserWrapper(data, func() error {
err := data.Close()
- container.UnmountVolumes(true)
+ container.UnmountVolumes(true, daemon.LogVolumeEvent)
daemon.Unmount(container)
container.Unlock()
return err
@@ -181,7 +181,7 @@ func (daemon *Daemon) containerExtractToDir(container *container.Container, path
defer daemon.Unmount(container)
err = daemon.mountVolumes(container)
- defer container.UnmountVolumes(true)
+ defer container.UnmountVolumes(true, daemon.LogVolumeEvent)
if err != nil {
return err
}
@@ -283,7 +283,7 @@ func (daemon *Daemon) containerCopy(container *container.Container, resource str
defer func() {
if err != nil {
// unmount any volumes
- container.UnmountVolumes(true)
+ container.UnmountVolumes(true, daemon.LogVolumeEvent)
// unmount the container's rootfs
daemon.Unmount(container)
}
@@ -320,7 +320,7 @@ func (daemon *Daemon) containerCopy(container *container.Container, resource str
reader := ioutils.NewReadCloserWrapper(archive, func() error {
err := archive.Close()
- container.UnmountVolumes(true)
+ container.UnmountVolumes(true, daemon.LogVolumeEvent)
daemon.Unmount(container)
container.Unlock()
return err