Fix issue with keep alive caused by nil channel

unnecessary archiving of droplets in images

dospin.go

@@ -10,6 +10,7 @@ package main
 import (
 	"flag"
 	"log"
+	"os"
 )
 
 const (
@@ -18,14 +19,16 @@ const (
 )
 
 type cmdOptions struct {
-	config string
-	cmd    string
+	config  string
+	logFile string
+	cmd     string
 }
 
 func parseCmdOptions() cmdOptions {
 	var o cmdOptions
 	flag.StringVar(&o.cmd, "cmd", CMD_SERVE, "Mode to run command in ("+CMD_SERVE+","+CMD_SPINDOWNALL+")")
 	flag.StringVar(&o.config, "config", "dospin.json", "Path to the dospin config file")
+	flag.StringVar(&o.logFile, "logFile", "stdout", "Path to the dospin log file")
 	flag.Parse()
 	return o
 }
@@ -45,6 +48,16 @@ func spindownAll(opts cmdOptions) {
 }
 
 func runServer(opts cmdOptions) {
+	if opts.logFile != "stdout" {
+		logFile, err := os.OpenFile(opts.logFile, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0664)
+		if err == nil {
+			defer logFile.Close()
+			log.SetOutput(logFile)
+		} else {
+			log.Print("Could not open log file: ", err)
+
+		}
+	}
 	log.Println("Loading config:", opts.config)
 	settings, err := loadSettings(opts.config)
 	if err != nil {

dospin.json

@@ -7,7 +7,11 @@
 			"InitialSize": "4gb",
 			"Size": "4gb",
 			"Region": "nyc1",
-			"SshKeys": [513314, 1667247],
+			"SshKeys": [
+				"Key1",
+				"gtalent2@gmail.com"
+			],
+			"UsePersistentImage": false,
 			"ImageSlug": "ubuntu-16-04-x64",
 			"Volumes": ["volume-nyc1-01"],
 			"UserData": "#!/bin/bash\napt-get update\napt-get install -y docker.io\nmkdir -p /mnt/volume-nyc1-01\nmount -o discard,defaults /dev/disk/by-id/scsi-0DO_Volume_volume-nyc1-01 /mnt/volume-nyc1-01\necho /dev/disk/by-id/scsi-0DO_Volume_volume-nyc1-01 /mnt/volume-nyc1-01 ext4 defaults,nofail,discard 0 0 | tee -a /etc/fstab\ndocker run -d --restart=always -p 25565:25565 -v /mnt/volume-nyc1-01/minecraft-server:/minecraft-server -w /minecraft-server -t java:8-alpine sh start.sh"

droplethandler.go

@@ -28,22 +28,6 @@ func (t *tokenSource) Token() (*oauth2.Token, error) {
 	return token, nil
 }
 
-func sshKeys(ids []int) []godo.DropletCreateSSHKey {
-	var out []godo.DropletCreateSSHKey
-	for _, id := range ids {
-		out = append(out, godo.DropletCreateSSHKey{ID: id})
-	}
-	return out
-}
-
-func volumes(names []string) []godo.DropletCreateVolume {
-	var out []godo.DropletCreateVolume
-	for _, name := range names {
-		out = append(out, godo.DropletCreateVolume{Name: name})
-	}
-	return out
-}
-
 type DropletHandler struct {
 	client   *godo.Client
 	settings Settings
@@ -103,8 +87,8 @@ func (me *DropletHandler) Spinup(name string) (string, error) {
 			Region:            vd.Region,
 			Size:              size,
 			PrivateNetworking: true,
-			SSHKeys:           sshKeys(vd.SshKeys),
-			Volumes:           volumes(vd.Volumes),
+			SSHKeys:           me.sshKeys(vd.SshKeys),
+			Volumes:           me.volumes(vd.Volumes),
 			UserData:          vd.UserData,
 			Image:             image,
 		}
@@ -153,8 +137,8 @@ func (me *DropletHandler) Spinup(name string) (string, error) {
 		}
 
 		// delete the image
-		log.Println("Spinup: Deleting image " + name)
-		if image.ID > -1 {
+		if image.ID > 0 {
+			log.Println("Spinup: Deleting image " + name)
 			_, err = me.client.Images.Delete(image.ID)
 			if err != nil {
 				log.Println("Spinup: Could not delete image: ", err)
@@ -182,7 +166,8 @@ func (me *DropletHandler) Spinup(name string) (string, error) {
 func (me *DropletHandler) Spindown(name string) error {
 	droplet, err := me.getDroplet(name)
 	if err != nil {
-		return err
+		// droplet not existing is not an error
+		return nil
 	}
 
 	// power off
@@ -192,12 +177,14 @@ func (me *DropletHandler) Spindown(name string) error {
 	}
 
 	// snapshot existing droplet
-	log.Println("Spindown: Creating image " + name)
-	action, _, err := me.client.DropletActions.Snapshot(droplet.ID, DROPLET_NS+name)
-	if err != nil || !me.actionWait(action.ID) {
-		return err
+	if me.settings.Servers[name].UsePersistentImage {
+		log.Println("Spindown: Creating image " + name)
+		action, _, err := me.client.DropletActions.Snapshot(droplet.ID, DROPLET_NS+name)
+		if err != nil || !me.actionWait(action.ID) {
+			return err
+		}
+		log.Println("Spindown: Created image " + name)
 	}
-	log.Println("Spindown: Created image " + name)
 
 	// delete droplet
 	log.Println("Spindown: Deleting droplet " + name)
@@ -318,3 +305,46 @@ func (me *DropletHandler) actionWait(actionId int) bool {
 		time.Sleep(1000 * time.Millisecond)
 	}
 }
+
+func (me *DropletHandler) sshKeys(keyNames []string) []godo.DropletCreateSSHKey {
+	// build key map
+	page := 0
+	perPage := 200
+	keyMap := make(map[string]string)
+	for {
+		page++
+		opt := &godo.ListOptions{
+			Page:    page,
+			PerPage: perPage,
+		}
+		keys, _, err := me.client.Keys.List(opt)
+		if err != nil {
+			break
+		}
+
+		for _, v := range keys {
+			keyMap[v.Name] = v.Fingerprint
+		}
+
+		// check next page?
+		if len(keys) < perPage {
+			break
+		}
+	}
+
+	// build output key list
+	var out []godo.DropletCreateSSHKey
+	for _, kn := range keyNames {
+		fp := keyMap[kn]
+		out = append(out, godo.DropletCreateSSHKey{Fingerprint: fp})
+	}
+	return out
+}
+
+func (me *DropletHandler) volumes(names []string) []godo.DropletCreateVolume {
+	var out []godo.DropletCreateVolume
+	for _, name := range names {
+		out = append(out, godo.DropletCreateVolume{Name: name})
+	}
+	return out
+}

net.go

@@ -11,6 +11,7 @@ import (
 	"io"
 	"log"
 	"net"
+	"time"
 )
 
 const (
@@ -28,19 +29,27 @@ func portForward(wanConn *net.TCPConn, lanIp, port string, connStatus chan ConnS
 	log.Print("Proxy: Connecting to ", lanIp+":"+port)
 	lanConn, err := net.Dial("tcp", lanIp+":"+port)
 	if err != nil {
-		log.Print("Proxy: LAN dial error:", err)
+		log.Print("Proxy: LAN dial error: ", err)
 		return
 	}
 
 	go forwardConn(wanConn, lanConn, done)
 	go forwardConn(lanConn, wanConn, done)
 
-	for i := 0; i < 2; i++ {
-		err = <-done
-		if err != nil {
-			log.Print("Proxy:", err)
+	ticker := time.NewTicker(1 * time.Minute)
+	for i := 0; i < 2; {
+		select {
+		case err = <-done:
+			if err != nil {
+				log.Print("Proxy: ", err)
+			}
+			i++
+		case <-ticker.C:
+			connStatus <- ConnStatus{Status: CONN_ACTIVE}
 		}
 	}
+	log.Print("Proxy: ending connection: ", wanConn.LocalAddr().String())
+	ticker.Stop()
 
 	wanConn.Close()
 	lanConn.Close()

servermanager.go

@@ -35,10 +35,9 @@ type ServerManager struct {
 	name              string
 	ports             []int
 	in                chan serverManagerEvent
-	done              chan interface{}
+	done              chan int
 	connStatus        chan ConnStatus
 	lastKeepAliveTime time.Time
-	usageScore        int // spin down server when this reaches 0
 	server            ServerHandler
 }
 
@@ -48,9 +47,10 @@ func NewServerManager(name string, server ServerHandler, settings Settings) *Ser
 	sm.name = name
 	sm.ports = settings.Servers[name].Ports
 	sm.in = make(chan serverManagerEvent)
-	sm.done = make(chan interface{})
-	sm.usageScore = 5
+	sm.done = make(chan int)
+	sm.connStatus = make(chan ConnStatus)
 	sm.server = server
+	sm.lastKeepAliveTime = time.Now()
 
 	return sm
 }
@@ -61,8 +61,8 @@ func NewServerManager(name string, server ServerHandler, settings Settings) *Ser
 func (me *ServerManager) Serve() {
 	// TODO: see if server is currently up, and setup port forwarding if so
 
-	fiveMin := time.Duration(5) * time.Minute
-	ticker := time.NewTicker(fiveMin)
+	activityTimeout := time.Duration(5 * time.Minute)
+	ticker := time.NewTicker(activityTimeout)
 
 	// event loop
 	for running := true; running; {
@@ -74,14 +74,16 @@ func (me *ServerManager) Serve() {
 		case action := <-me.in:
 			running = me.serveAction(action)
 		case <-ticker.C:
-			if time.Since(me.lastKeepAliveTime) > fiveMin {
-				me.Spindown()
+			if time.Since(me.lastKeepAliveTime) > activityTimeout {
+				running = me.serveAction(serverManagerEvent{eventType: SERVERMANAGER_SPINDOWN})
 			}
 		}
 	}
 
+	ticker.Stop()
+
 	// notify done
-	me.done <- 42
+	me.done <- 0
 }
 
 /*
@@ -141,6 +143,7 @@ func (me *ServerManager) serveAction(event serverManagerEvent) bool {
 	switch event.eventType {
 	case SERVERMANAGER_SPINUP:
 		targetIp, err := me.server.Spinup(me.name)
+		me.lastKeepAliveTime = time.Now()
 		if err == nil {
 			log.Println("ServerManager: Got IP for", me.name+":", targetIp)
 			wanAddr := event.tcpConn.LocalAddr().String()

settings.go

@@ -18,15 +18,16 @@ type Settings struct {
 }
 
 type Server struct {
-	Ports       []int
-	UsePublicIP bool
-	InitialSize string
-	Size        string
-	Region      string
-	ImageSlug   string
-	UserData    string
-	SshKeys     []int
-	Volumes     []string
+	Ports              []int
+	UsePublicIP        bool
+	InitialSize        string
+	Size               string
+	Region             string
+	UsePersistentImage bool
+	ImageSlug          string
+	UserData           string
+	SshKeys            []string
+	Volumes            []string
 }
 
 func loadSettings(path string) (Settings, error) {