docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-25 03:42:05 +03:00
Code Activity

Merge pull request #6121 from unclejack/refactor_daemon_restore

Browse Source 
optimize restore & use Getenv less in daemon.go
Upstream-commit: 251de0887b573d6ec4764f322415e2a494256de9
Component: engine
This commit is contained in:
Michael Crosby
2014-05-30 11:37:12 -07:00
parent db7fb46f61 1c65521b44
commit c15b4adb65
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
components/engine/daemon/daemon.go
View File

@@ -327,7 +327,9 @@ func (daemon *Daemon) Destroy(container *Container) error {
}
func (daemon *Daemon) restore() error {
if os.Getenv("DEBUG") == "" && os.Getenv("TEST") == "" {
debug := (os.Getenv("DEBUG") != "" || os.Getenv("TEST") != "")
if !debug {
fmt.Printf("Loading containers: ")
}
dir, err := ioutil.ReadDir(daemon.repository)
@@ -340,7 +342,7 @@ func (daemon *Daemon) restore() error {
for _, v := range dir {
id := v.Name()
container, err := daemon.load(id)
if os.Getenv("DEBUG") == "" && os.Getenv("TEST") == "" {
if !debug {
fmt.Print(".")
}
if err != nil {
@@ -357,20 +359,16 @@ func (daemon *Daemon) restore() error {
}
}
registerContainer := func(container *Container) {
if err := daemon.register(container, false); err != nil {
utils.Debugf("Failed to register container %s: %s", container.ID, err)
}
}
if entities := daemon.containerGraph.List("/", -1); entities != nil {
for _, p := range entities.Paths() {
if os.Getenv("DEBUG") == "" && os.Getenv("TEST") == "" {
if !debug {
fmt.Print(".")
}
e := entities[p]
if container, ok := containers[e.ID()]; ok {
registerContainer(container)
if err := daemon.register(container, false); err != nil {
utils.Debugf("Failed to register container %s: %s", container.ID, err)
}
delete(containers, e.ID())
}
}
@@ -383,11 +381,13 @@ func (daemon *Daemon) restore() error {
if err != nil {
utils.Debugf("Setting default id - %s", err)
}
registerContainer(container)
if err := daemon.register(container, false); err != nil {
utils.Debugf("Failed to register container %s: %s", container.ID, err)
}
}
daemon.idIndex.UpdateSuffixarray()
if os.Getenv("DEBUG") == "" && os.Getenv("TEST") == "" {
if !debug {
fmt.Printf(": done.\n")
}