.gitignore

@@ -1,3 +1,4 @@
+service
 # ---> Go
 # Binaries for programs and plugins
 *.exe

cmd/service/main.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"bufio"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -12,8 +11,6 @@ import (
 	"git.kettek.net/accord/service/internal/version"
 )
 
-var startMsg StartMessage
-
 func main() {
 	// Read config.
 	cfg.Init()
@@ -25,6 +22,7 @@ func main() {
 	var jsonEncoder *json.Encoder
 
 	stat, _ := os.Stdin.Stat()
+	var startMsg StartMessage
 	if (stat.Mode() & os.ModeCharDevice) == 0 {
 		dec := json.NewDecoder(os.Stdin)
 		dec.Decode(&startMsg)
@@ -33,26 +31,20 @@ func main() {
 	if !startMsg.EnableJSON {
 		fmt.Println("No EnableJSON message received, starting as stand-alone service.")
 		fmt.Printf("  Git Id: %s\n", version.GitCommitId)
-		go consoleReadLoop(os.Stdin, quitChannel, readChannel)
+		// TODO: Some sort of interactive console for basic server commands.
 	} else {
 		jsonEncoder = json.NewEncoder(os.Stdout)
 		jsonEncoder.Encode(VersionMessage{
 			GitCommitId: version.GitCommitId,
 		})
-		if startMsg.NewlineFlush {
-			fmt.Fprintf(os.Stdout, "\n")
-		}
 		fmt.Fprintf(os.Stderr, "Starting in bi-directional JSON mode")
 
 		// Start our STDIN read loop
 		if cfg.UsePipes {
 			go jsonReadLoop(os.Stdin, quitChannel, readChannel)
 		}
-	}
-
 		// Begin waiting for data on our channels.
-	done := false
+		for {
-	for !done {
 			select {
 			case msg := <-readChannel:
 				fmt.Fprintf(os.Stderr, "%+v\n", msg)
@@ -61,11 +53,11 @@ func main() {
 					log.Fatal(err)
 				}
 				fmt.Fprintf(os.Stderr, "Quitting\n")
-			done = true
 				break
 			}
 		}
 	}
+}
 
 // AMessage is our base Accord message.
 type AMessage struct{}
@@ -73,7 +65,6 @@ type AMessage struct{}
 // StartMessage is a bogus message for enabling JSON mode
 type StartMessage struct {
 	EnableJSON bool `json:"enableJSON"`
-	NewlineFlush bool `json:"newlineFlush"`
 }
 
 // VersionMessage is a message sent to the frontend immediately after JSON mode has been initiated.
@@ -98,18 +89,3 @@ func jsonReadLoop(reader io.Reader, quitChannel chan error, readChannel chan AMe
 		readChannel <- msg
 	}
 }
-
-func consoleReadLoop(r io.Reader, quitChannel chan error, readChannel chan AMessage) {
-	scanner := bufio.NewScanner(r)
-	for scanner.Scan() {
-		v := scanner.Text()
-		err := scanner.Err()
-		if err != nil {
-			quitChannel <- err
-			break
-		} else if v == "quit" {
-			quitChannel <- nil
-			break
-		}
-	}
-}