jcarr
/
dnssecsocket
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix hostname with domain name and vis-a-vis 

Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
Jeff Carr 2019-06-04 23:15:55 +00:00
parent 0ef6a9b47b
commit 96c44afee1
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gorilla-server/apiJSON.go
View File

@ -107,7 +107,7 @@ func POSTbody(ge *pb.Event, URL string) string {
log.Println("POSTbody() can't make new req") log.Println("POSTbody() can't make new req")
return "" return ""
} }
token := ge.Account.Token token := ge.Account.Token
if (token == "") { if (token == "") {
token = "POSTbodyEmptyToken" token = "POSTbodyEmptyToken"

16
gorilla-server/main.go
View File

@ -2,6 +2,8 @@ package main
import "flag" import "flag"
import "log" import "log"
import "fmt"
import "regexp"
import "net/http" import "net/http"
import "encoding/json" import "encoding/json"
import "io/ioutil" import "io/ioutil"
@ -142,7 +144,8 @@ func processGetEvent(ge *pb.Event) *pb.Event {
evm.Cpus = 1 evm.Cpus = 1
evm.Memory = 512 evm.Memory = 512
evm.Disk = 20 evm.Disk = 20
evm.Hostname = vm.Name + "." + enetwork.Name // TODO: bmath -- let's change the stack-api to remove this hack
evm.Hostname = vm.Name + "." + enetwork.Name + ".customers.wprod.wit.com"
e.Vms = append(e.Vms, &evm) e.Vms = append(e.Vms, &evm)
log.Println("\tvm.Name =",vm.Name) log.Println("\tvm.Name =",vm.Name)
@ -194,7 +197,16 @@ func processAddEvent(ge *pb.Event) *pb.Event {
return e return e
} }
url := ge.Account.URL + "vms/" + ge.Account.Domain + "?count=1&cpu=2&ram=512&disk=25" a := regexp.MustCompile(`\.`) // split subdomain on .
stuff := a.Split(ge.Account.Domain, -1)
log.Printf("processAddEvent() stuff = %q\n", stuff)
log.Println("processAddEvent() host =", stuff[0])
log.Println("processAddEvent() memory =", ge.Vms[0].Memory)
memory := fmt.Sprintf("%d", ge.Vms[0].Memory)
url := ge.Account.URL + "vms/" + stuff[0] + "?count=1&cpu=2&ram=" + memory + "&disk=25"
log.Println("processAddEvent() new URL =", url)
newVM := string(POSTbody(ge, url)) newVM := string(POSTbody(ge, url))
log.Println("processAddEvent() recieved newVM=", newVM) log.Println("processAddEvent() recieved newVM=", newVM)