gary/dospin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: gary:master
Branches Tags
gary:master
gary:release-0.1.0
gary:release-0.0.0
..
compare: gary:release-0.1.0
Branches Tags
gary:master
gary:release-0.1.0
gary:release-0.0.0

No commits in common. "master" and "release-0.1.0" have entirely different histories.
master ... release-0.

2 changed files with 16 additions and 19 deletions
Show Stats Expand all files Collapse all files

6
dospin.go
View File

@ -47,7 +47,7 @@ func spindownAll(opts cmdOptions) {
} }
} }
func runServer(opts cmdOptions) int { func runServer(opts cmdOptions) {
if opts.logFile != "stdout" { if opts.logFile != "stdout" {
logFile, err := os.OpenFile(opts.logFile, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0664) logFile, err := os.OpenFile(opts.logFile, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0664)
if err == nil { if err == nil {
@ -78,8 +78,8 @@ func runServer(opts cmdOptions) int {
} }
} }
done := make(chan int) done := make(chan interface{})
return <-done <-done
} }
func main() { func main() {

29
droplethandler.go
View File

@ -8,7 +8,6 @@
package main package main
import ( import (
"context"
"errors" "errors"
"github.com/digitalocean/godo" "github.com/digitalocean/godo"
"golang.org/x/oauth2" "golang.org/x/oauth2"
@ -31,14 +30,12 @@ func (t *tokenSource) Token() (*oauth2.Token, error) {
type DropletHandler struct { type DropletHandler struct {
client *godo.Client client *godo.Client
ctx context.Context
settings Settings settings Settings
} }
func NewDropletHandler(settings Settings) *DropletHandler { func NewDropletHandler(settings Settings) *DropletHandler {
retval := new(DropletHandler) retval := new(DropletHandler)
retval.settings = settings retval.settings = settings
retval.ctx = context.TODO()
// setup DO client // setup DO client
tokenSource := &tokenSource{settings.ApiToken} tokenSource := &tokenSource{settings.ApiToken}
@ -97,7 +94,7 @@ func (me *DropletHandler) Spinup(name string) (string, error) {
} }
log.Println("Spinup: Creating " + name) log.Println("Spinup: Creating " + name)
droplet, _, err := me.client.Droplets.Create(me.ctx, createRequest) droplet, _, err := me.client.Droplets.Create(createRequest)
if err != nil { if err != nil {
log.Println(err) log.Println(err)
if droplet == nil { if droplet == nil {
@ -106,7 +103,7 @@ func (me *DropletHandler) Spinup(name string) (string, error) {
} }
// wait until machine is ready // wait until machine is ready
for { for {
d, _, err := me.client.Droplets.Get(me.ctx, droplet.ID) d, _, err := me.client.Droplets.Get(droplet.ID)
if err != nil { if err != nil {
log.Println(err) log.Println(err)
return "", err return "", err
@ -124,7 +121,7 @@ func (me *DropletHandler) Spinup(name string) (string, error) {
// resize // resize
log.Println("Spinup: Resizing " + name) log.Println("Spinup: Resizing " + name)
action, _, err := me.client.DropletActions.Resize(me.ctx, droplet.ID, vd.Size, false) action, _, err := me.client.DropletActions.Resize(droplet.ID, vd.Size, false)
if err != nil || !me.actionWait(action.ID) { if err != nil || !me.actionWait(action.ID) {
return "", err return "", err
} }
@ -132,7 +129,7 @@ func (me *DropletHandler) Spinup(name string) (string, error) {
// power back on // power back on
log.Println("Spinup: Powering on " + name) log.Println("Spinup: Powering on " + name)
action, _, err = me.client.DropletActions.PowerOn(me.ctx, droplet.ID) action, _, err = me.client.DropletActions.PowerOn(droplet.ID)
if err != nil || !me.actionWait(action.ID) { if err != nil || !me.actionWait(action.ID) {
return "", err return "", err
} }
@ -142,7 +139,7 @@ func (me *DropletHandler) Spinup(name string) (string, error) {
// delete the image // delete the image
if image.ID > 0 { if image.ID > 0 {
log.Println("Spinup: Deleting image " + name) log.Println("Spinup: Deleting image " + name)
_, err = me.client.Images.Delete(me.ctx, image.ID) _, err = me.client.Images.Delete(image.ID)
if err != nil { if err != nil {
log.Println("Spinup: Could not delete image: ", err) log.Println("Spinup: Could not delete image: ", err)
} else { } else {
@ -153,7 +150,7 @@ func (me *DropletHandler) Spinup(name string) (string, error) {
// get the private IP and return it // get the private IP and return it
// get new copy of droplet that has IP // get new copy of droplet that has IP
droplet, _, err = me.client.Droplets.Get(me.ctx, droplet.ID) droplet, _, err = me.client.Droplets.Get(droplet.ID)
if err == nil { if err == nil {
if vd.UsePublicIP { if vd.UsePublicIP {
return droplet.PublicIPv4() return droplet.PublicIPv4()
@ -182,7 +179,7 @@ func (me *DropletHandler) Spindown(name string) error {
// snapshot existing droplet // snapshot existing droplet
if me.settings.Servers[name].UsePersistentImage { if me.settings.Servers[name].UsePersistentImage {
log.Println("Spindown: Creating image " + name) log.Println("Spindown: Creating image " + name)
action, _, err := me.client.DropletActions.Snapshot(me.ctx, droplet.ID, DROPLET_NS+name) action, _, err := me.client.DropletActions.Snapshot(droplet.ID, DROPLET_NS+name)
if err != nil || !me.actionWait(action.ID) { if err != nil || !me.actionWait(action.ID) {
return err return err
} }
@ -191,7 +188,7 @@ func (me *DropletHandler) Spindown(name string) error {
// delete droplet // delete droplet
log.Println("Spindown: Deleting droplet " + name) log.Println("Spindown: Deleting droplet " + name)
_, err = me.client.Droplets.Delete(me.ctx, droplet.ID) _, err = me.client.Droplets.Delete(droplet.ID)
if err != nil { if err != nil {
return err return err
} }
@ -219,7 +216,7 @@ func (me *DropletHandler) poweroff(name string) error {
break break
} }
time.Sleep(100 * time.Millisecond) time.Sleep(100 * time.Millisecond)
_, _, err = me.client.DropletActions.Shutdown(me.ctx, droplet.ID) _, _, err = me.client.DropletActions.Shutdown(droplet.ID)
if err != nil { if err != nil {
log.Println("Power down of", name, "failed:", err) log.Println("Power down of", name, "failed:", err)
} }
@ -241,7 +238,7 @@ func (me *DropletHandler) getDroplet(name string) (godo.Droplet, error) {
Page: page, Page: page,
PerPage: perPage, PerPage: perPage,
} }
images, _, err := me.client.Droplets.List(me.ctx, opt) images, _, err := me.client.Droplets.List(opt)
if err != nil { if err != nil {
break break
} }
@ -273,7 +270,7 @@ func (me *DropletHandler) getSnapshot(name string) (godo.Image, error) {
Page: page, Page: page,
PerPage: perPage, PerPage: perPage,
} }
images, _, err := me.client.Images.ListUser(me.ctx, opt) images, _, err := me.client.Images.ListUser(opt)
if err != nil { if err != nil {
break break
} }
@ -296,7 +293,7 @@ func (me *DropletHandler) getSnapshot(name string) (godo.Image, error) {
func (me *DropletHandler) actionWait(actionId int) bool { func (me *DropletHandler) actionWait(actionId int) bool {
for { for {
a, _, err := me.client.Actions.Get(me.ctx, actionId) a, _, err := me.client.Actions.Get(actionId)
if err != nil { if err != nil {
log.Println("Action retrieval failed: ", err) log.Println("Action retrieval failed: ", err)
} else if a.Status == "completed" { } else if a.Status == "completed" {
@ -320,7 +317,7 @@ func (me *DropletHandler) sshKeys(keyNames []string) []godo.DropletCreateSSHKey
Page: page, Page: page,
PerPage: perPage, PerPage: perPage,
} }
keys, _, err := me.client.Keys.List(me.ctx, opt) keys, _, err := me.client.Keys.List(opt)
if err != nil { if err != nil {
break break
} }