refactor: hub reorganized a little

cmd/circologd/http.go

@@ -9,7 +9,7 @@ import (
 	"gopkg.in/mcuadros/go-syslog.v2/format"
 )
 
-func setupHttp(hub circolog.Hub) {
+func setupHTTP(hub circolog.Hub) {
 	http.HandleFunc("/", getHTTPHandler(hub))
 	http.HandleFunc("/ws", getWSHandler(hub))
 }

cmd/circologd/main.go

@@ -46,7 +46,7 @@ func main() {
 	}
 	go hub.Run()
 
-	setupHttp(hub)
+	setupHTTP(hub)
 	if *querySocket != "" {
 		fmt.Printf("Binding address `%s` [http]\n", *querySocket)
 		unixListener, err := net.Listen("unix", *querySocket)

hub.go

@@ -38,19 +38,15 @@ func NewHub(ringBufSize int) Hub {
 	}
 }
 
-// Run is hub main loop; keeps everything going
-func (h *Hub) Run() {
-	for {
-		select {
-		case cl := <-h.Register:
+func (h *Hub) register(cl Client) {
 	if _, ok := h.clients[cl]; !ok {
 		if !cl.Nofollow { // we won't need it in future
 			h.clients[cl] = true
 		}
 
-				circbuf_do_exit := false
+		circbufDoExit := false
 		h.circbuf.Do(func(x interface{}) {
-					if circbuf_do_exit {
+			if circbufDoExit {
 				return
 			}
 			if x != nil {
@@ -58,7 +54,7 @@ func (h *Hub) Run() {
 				case cl.Messages <- x.(format.LogParts):
 					break
 				case <-time.After(500 * time.Millisecond):
-							circbuf_do_exit = true
+					circbufDoExit = true
 					break
 				}
 			}
@@ -67,6 +63,14 @@ func (h *Hub) Run() {
 			close(cl.Messages)
 		}
 	}
+}
+
+// Run is hub main loop; keeps everything going
+func (h *Hub) Run() {
+	for {
+		select {
+		case cl := <-h.Register:
+			h.register(cl)
 		case cl := <-h.Unregister:
 			_, ok := h.clients[cl]
 			if ok {