added basic server struct

1 files changed, 16 insertions, 26 deletions

diff --git a/src/rhctl/main.go b/src/rhctl/main.go
index e86eeb0..2788b46 100644
--- a/src/rhctl/main.go
+++ b/src/rhctl/main.go
@@ -27,8 +27,7 @@ import (
 	"io/ioutil"
 	"log"
 	"os"
-	"os/signal"
-	"sync"
+	"time"
 )
 
 var (
@@ -72,39 +71,30 @@ func main() {
 		return
 	}
 
-	var wg sync.WaitGroup
-
-	port, err := SerialOpenAndHandle("/dev/ttyUSB0", B38400)
-	if err != nil {
-		rhl.Println("Error opening serial:", err)
-		return
-	}
-	port.tx <- "hello world\n"
-
 	if webAddr.Get().(string) != "" {
-		wg.Add(1)
 		go func() {
-			defer wg.Done()
 			rhl.Println("starting web-api:", webAddr.Get().(string))
+			for {
+				time.Sleep(time.Second)
+			}
 			//StartWeb(webAddr.Get().(string))
 			rhl.Println("web-api finished")
 		}()
 	}
 
-	alldone := make(chan bool)
-	go func() {
-		defer func() { alldone <- true }()
-		wg.Wait()
-	}()
-
-	c := make(chan os.Signal, 1)
-	signal.Notify(c, os.Interrupt)
-
-	select {
-	case <-c:
-		rhl.Println("received interrupt, shutdown")
+	master, err := ServerInit("master", "/dev/ttyUSB0", "/dev/ttyUSB1", B38400)
+	if err != nil {
+		rhl.Println("error master server: ", err)
 		return
-	case <-alldone:
+	}
+
+	standby, err := ServerInit("standby", "/dev/ttyUSB2", "/dev/ttyUSB3", B38400)
+	if err != nil {
+		rhl.Println("error standby server: ", err)
 		return
 	}
+
+	master.Run()
+	standby.Run()
+	time.Sleep(time.Second)
 }