Reformat and add global message subscriptions

socketserver/cmd/socketserver/socketserver.go

@@ -1,10 +1,10 @@
 package main // import "bitbucket.org/stendec/frankerfacez/socketserver/cmd/socketserver"
 
 import (
+	"../../internal/server"
 	"flag"
 	"log"
 	"net/http"
-	"../../internal/server"
 )
 
 var origin *string = flag.String("origin", "localhost:8001", "Client-visible origin of the socket server")
@@ -34,11 +34,11 @@ func main() {
 		log.Fatalln("Either both --crt and --key can be provided, or neither.")
 	}
 
-	conf := &server.Config {
-		SSLKeyFile: *privateKeyFile,
+	conf := &server.Config{
+		SSLKeyFile:         *privateKeyFile,
 		SSLCertificateFile: *certificateFile,
-		UseSSL: *usessl,
-		NaclKeysFile: *naclKeysFile,
+		UseSSL:             *usessl,
+		NaclKeysFile:       *naclKeysFile,
 
 		SocketOrigin: *origin,
 	}
@@ -61,7 +61,6 @@ func main() {
 	}
 }
 
-
 func GenerateKeys(outputFile string) {
 	if flag.NArg() < 1 {
 		log.Fatal("The server ID must be specified")
@@ -71,4 +70,4 @@ func GenerateKeys(outputFile string) {
 	} else {
 		server.GenerateKeys(outputFile, flag.Arg(0), "")
 	}
-}
+}