Back to http

mastrolinux · mastrolinux · commit 5f3ef3db0dc0 · 2015-06-12T11:22:03.000+02:00
Former-commit-id: 99ac0a401449375d0e43067a46113cd3acdacc5b [formerly a3f9f992097ebd3350a25dbb8cebbc37f4b80150]
Former-commit-id: 57d837f8759a29a88c7235265b496d9346206124
diff --git a/home.html b/home.html
@@ -1,7 +1,7 @@
 <html>
 <head>
 <title>Serial Port Example</title>
-<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
+<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
 <script type="text/javascript">
     $(function() {
 
@@ -31,7 +31,7 @@
     });
 
     if (window["WebSocket"]) {
-        conn = new WebSocket("ws://{{$}}/ws");
+        conn = new WebSocket("wss://{{$}}/ws");
         conn.onclose = function(evt) {
             appendLog($("<div><b>Connection closed.</b></div>"))
         }
diff --git a/main.go b/main.go
@@ -165,6 +165,19 @@ func main() {
 
 		log.Println("The Serial Port JSON Server is now running.")
 		log.Println("If you are using ChiliPeppr, you may go back to it and connect to this server.")
+	// launch the hub routine which is the singleton for the websocket server
+	go h.run()
+	// launch our serial port routine
+	go sh.run()
+	// launch our dummy data routine
+	//go d.run()
+
+	http.HandleFunc("/", homeHandler)
+	http.HandleFunc("/ws", wsHandler)
+	if err := http.ListenAndServe(*addr, nil); err != nil {
+		fmt.Printf("Error trying to bind to port: %v, so exiting...", err)
+		log.Fatal("Error ListenAndServe:", err)
+	}
 
 		// see if they provided a regex filter
 		if len(*regExpFilter) > 0 {
@@ -264,7 +277,7 @@ const homeTemplateHtml = `<!DOCTYPE html>
 <html>
 <head>
 <title>Serial Port Example</title>
-<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
+<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
 <script type="text/javascript">
     $(function() {
 
