From 6934c8a2c42def64d890aae8eb79b9ef8be55fd2 Mon Sep 17 00:00:00 2001
From: Jeff Carr <jcarr@wit.com>
Date: Sun, 27 Oct 2024 05:43:01 -0500
Subject: [PATCH] does spice ports

Signed-off-by: Jeff Carr <jcarr@wit.com>
---
 http.go    | 18 +++++++++---------
 main.go    |  1 +
 start.go   | 10 +++++++++-
 structs.go |  1 +
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/http.go b/http.go
index bb5c090..8463d4a 100644
--- a/http.go
+++ b/http.go
@@ -90,12 +90,12 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if tmp == "/start" {
-		log.Info("/start jcarr actually doing START")
-		fmt.Fprintln(w, "/start jcarr actually doing START")
+		log.Info("/start jcarr actually doing START", me.Hostname)
+		fmt.Fprintln(w, "/start jcarr actually doing START", me.Hostname)
 		start := r.URL.Query().Get("start")
 		xml := "/tmp/" + start + ".xml"
 		if shell.Unlink(xml) {
-			fmt.Fprintln(w, "START FAILED")
+			fmt.Fprintln(w, "START FAILED", me.Hostname)
 			fmt.Fprintln(w, "error =", "could not remove existing xml file", xml)
 			fmt.Fprintln(w, "error =", "file still exists after unlink")
 			return
@@ -108,25 +108,25 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
 		fmt.Fprintln(w, "msg =", string(msg))
 		fmt.Fprintln(w, "/start ReadAll() END")
 		if err != nil {
-			fmt.Fprintln(w, "START FAILED")
+			fmt.Fprintln(w, "START FAILED", me.Hostname)
 			fmt.Fprintln(w, "error =", err)
 			return
 		}
 		fmt.Fprintln(w, "START len(msg) =", len(msg))
 		err = d.UnmarshalJSON(msg)
 		if d.Hostname == "" {
-			fmt.Fprintln(w, "START hostname is blank")
+			fmt.Fprintln(w, "START hostname is blank", me.Hostname)
 			log.Info("START hostname is blank")
 			return
 		}
 
 		if err != nil {
-			fmt.Fprintln(w, "START FAILED")
+			fmt.Fprintln(w, "START FAILED", me.Hostname)
 			fmt.Fprintln(w, "error =", err)
 		}
 
 		if err := newStart(start, d); err != nil {
-			fmt.Fprintln(w, "START FAILED")
+			fmt.Fprintln(w, "START FAILED", me.Hostname)
 			fmt.Fprintln(w, "error =", err)
 			return
 		}
@@ -140,10 +140,10 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
 		err, ok, output := shell.RunCmd("/home/", cmd)
 		shell.Run(cmd)
 		if ok {
-			fmt.Fprintln(w, "START OK")
+			fmt.Fprintln(w, "START OK", me.Hostname)
 			fmt.Fprintln(w, output)
 		} else {
-			fmt.Fprintln(w, "START FAILED")
+			fmt.Fprintln(w, "START FAILED", me.Hostname)
 			fmt.Fprintln(w, "error =", err)
 			fmt.Fprintln(w, "output =", output)
 		}
diff --git a/main.go b/main.go
index 9bba77b..db81d9a 100644
--- a/main.go
+++ b/main.go
@@ -45,6 +45,7 @@ func main() {
 		pp.WriteHelp(os.Stdout)
 		os.Exit(0)
 	}
+	me.Hostname, _ = os.Hostname()
 
 	log.DaemonMode(true)
 
diff --git a/start.go b/start.go
index 433e0ab..02f5fef 100644
--- a/start.go
+++ b/start.go
@@ -20,7 +20,15 @@ func newStart(start string, d *pb.Droplet) error {
 	domcfg := &libvirtxml.Domain{}
 
 	mergeXML(domcfg, "standard.x86")
-	mergeXML(domcfg, "spice")
+	// ignore spice if it's not set
+	if d.SpicePort == 0 {
+		log.Info("spice port was not set. spice disabled")
+	} else {
+		mergeXML(domcfg, "spice")
+		if err := virtigoxml.SetSpicePort(d, domcfg); err != nil {
+			return err
+		}
+	}
 	mergeXML(domcfg, "qcow")
 
 	return virtigoxml.GenerateDropletXml(me.dirs, d, domcfg, start)
diff --git a/structs.go b/structs.go
index 99d4ee0..77d9c29 100644
--- a/structs.go
+++ b/structs.go
@@ -4,5 +4,6 @@ var me Virtigod
 
 // this app's variables
 type Virtigod struct {
+	Hostname string
 	dirs []string
 }