OLD | NEW |
1 package main | 1 package main |
2 | 2 |
3 import ( | 3 import ( |
4 "fmt" | 4 "fmt" |
5 "launchpad.net/gnuflag" | 5 "launchpad.net/gnuflag" |
6 "launchpad.net/juju-core/cmd" | 6 "launchpad.net/juju-core/cmd" |
7 "launchpad.net/juju-core/juju" | 7 "launchpad.net/juju-core/juju" |
8 "launchpad.net/juju-core/log" | 8 "launchpad.net/juju-core/log" |
9 "launchpad.net/juju-core/state" | 9 "launchpad.net/juju-core/state" |
10 "launchpad.net/juju-core/worker/uniter" | 10 "launchpad.net/juju-core/worker/uniter" |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 return a.tomb.Err() | 62 return a.tomb.Err() |
63 } | 63 } |
64 | 64 |
65 // runOnce runs a uniter once. | 65 // runOnce runs a uniter once. |
66 func (a *UnitAgent) runOnce() error { | 66 func (a *UnitAgent) runOnce() error { |
67 st, err := state.Open(&a.Conf.StateInfo) | 67 st, err := state.Open(&a.Conf.StateInfo) |
68 if err != nil { | 68 if err != nil { |
69 return err | 69 return err |
70 } | 70 } |
71 defer st.Close() | 71 defer st.Close() |
72 » u, err := uniter.NewUniter(st, a.UnitName) | 72 » u, err := uniter.NewUniter(st, a.UnitName, a.Conf.DataDir) |
73 if err != nil { | 73 if err != nil { |
74 return err | 74 return err |
75 } | 75 } |
76 return runTasks(a.tomb.Dying(), u) | 76 return runTasks(a.tomb.Dying(), u) |
77 } | 77 } |
OLD | NEW |