Merge branch 'master' into launch

This commit is contained in:
Frikky
2020-10-14 12:36:56 +02:00
committed by GitHub
15 changed files with 179 additions and 24 deletions
+2 -2
View File
@@ -6838,7 +6838,7 @@ func handleCloudSetup(resp http.ResponseWriter, request *http.Request) {
}
}
func init() {
func initHandlers() {
var err error
ctx := context.Background()
@@ -6964,7 +6964,7 @@ func init() {
// Had to move away from mux, which means Method is fucked up right now.
func main() {
//init()
initHandlers()
hostname, err := os.Hostname()
if err != nil {
hostname = "MISSING"