separate the rest

server/agent-connection.go → agent/agent-connection.go

@@ -1,4 +1,4 @@
-package server
+package agent
 
 import (
 	"bufio"
@@ -65,8 +65,8 @@ func handleAgentEvent(conn *agentConn, data []byte) bool {
 	}
 
 	// if a handler for this command exists, run it
-	if agentEventHandlers[command] != nil {
-		agentEventHandlers[command](conn, command, params)
+	if eventHandlers[command] != nil {
+		eventHandlers[command](conn, command, params)
 	}
 
 	return true

agent/agent-events.go

@@ -0,0 +1,3 @@
+package agent
+
+var eventHandlers = make(map[string]func(conn *agentConn, name string, params map[string]interface{}))

agent/agent-server.go

@@ -0,0 +1 @@
+package agent

httpserver/http-server.go

@@ -11,7 +11,7 @@ var templates *template.Template
 func Run() error {
 
 	// initialize templates
-	templates = template.Must(template.ParseGlob("server/templates/*"))
+	templates = template.Must(template.ParseGlob("httpserver/templates/*"))
 
 	// serve static files in devices directory
 	// FIXME: this allows access to vnc passwd files

main.go

@@ -1,7 +1,27 @@
 package main
 
-import "github.com/cooper/screenmgr/server"
+import (
+	_ "github.com/cooper/screenmgr/agent"
+	"github.com/cooper/screenmgr/device"
+	"github.com/cooper/screenmgr/httpserver"
+	_ "github.com/cooper/screenmgr/vnc"
+	"log"
+)
 
 func main() {
-	server.Run()
+	checkError("Find devices", device.FindDevices())
+	checkError("Setup devices", device.SetupDevices())
+	checkError("Run HTTP server", httpserver.Run())
+}
+
+func reportError(action string, err error) {
+	if err != nil {
+		log.Println(action, " error: ", err.Error())
+	}
+}
+
+func checkError(action string, err error) {
+	if err != nil {
+		log.Fatal(action, " error: ", err.Error())
+	}
 }

server/vnc.go → vnc/vnc.go

@@ -1,4 +1,4 @@
-package server
+package vnc
 
 // #include "vncauth.h"
 import "C"