handler: refactored code, rm root handler. hub, main, connection: refactored code

Author: Lapp

connection.go

@@ -8,8 +8,8 @@ type connection struct {
 	hub  *hub
 }
 
-func newConnection(ws *websocket.Conn, hub *hub) connection {
-	return connection{
+func newConnection(ws *websocket.Conn, hub *hub) *connection {
+	return &connection{
 		ws:   ws,
 		send: make(chan []byte, 256),
 		hub:  hub,

handler.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"fmt"
 	"github.com/gorilla/websocket"
 	"net/http"
 )
@@ -20,24 +19,19 @@ func newHandler(hub *hub) *handler {
 }
 
 func (h *handler) initRoutes() {
-	http.HandleFunc("/", h.index)
 	http.HandleFunc("/chat", h.chat)
 }
 
-func (h *handler) index(w http.ResponseWriter, r *http.Request) {
-	fmt.Fprint(w, "<h1>Chat on websockets</h1>")
-}
-
 func (h *handler) chat(w http.ResponseWriter, r *http.Request) {
 	ws, err := upgrader.Upgrade(w, r, nil)
 	if err != nil {
 		return
 	}
 
 	conn := newConnection(ws, h.hub)
-	conn.hub.register <- &conn
+	conn.hub.register <- conn
 	defer func() {
-		conn.hub.unregister <- &conn
+		conn.hub.unregister <- conn
 	}()
 
 	go conn.write()

hub.go

@@ -7,8 +7,8 @@ type hub struct {
 	unregister  chan *connection
 }
 
-func newHub() hub {
-	return hub{
+func newHub() *hub {
+	return &hub{
 		connections: make(map[*connection]struct{}),
 		broadcast:   make(chan []byte),
 		register:    make(chan *connection),

main.go

@@ -10,7 +10,7 @@ import (
 
 func main() {
 	hub := newHub()
-	handler := newHandler(&hub)
+	handler := newHandler(hub)
 	handler.initRoutes()
 	go hub.run()