cmd/jujud/unit.go - Issue 6567067: cmd/jujud: allow for a clean exit

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: cmd/jujud/unit.go

Issue 6567067: cmd/jujud: allow for a clean exit

Patch Set: Created 12 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.

Jump to:

Index: cmd/jujud/unit.go

=== modified file 'cmd/jujud/unit.go'

--- cmd/jujud/unit.go 2012-09-28 09:34:09 +0000

+++ cmd/jujud/unit.go 2012-09-28 09:57:23 +0000

@@ -57,6 +57,9 @@

return ug

}

+ if err == uniter.ErrDead {

niemeyer 2012/09/28 14:54:54 Same as for machine.

rog 2012/09/28 15:39:45 Done.

+ return nil

+ }

log.Printf("uniter: %v", err)

select {

case <-a.tomb.Dying():

@@ -76,6 +79,9 @@

}

defer st.Close()

unit, err := st.Unit(a.UnitName)

+ if state.IsNotFound(err) || err == nil && unit.Life() == state.Dead {

+ return uniter.ErrDead

+ }

if err != nil {

return err

}