|
@@ -4,18 +4,19 @@ import (
|
|
|
"net/http"
|
|
|
"time"
|
|
|
|
|
|
+ "git.lattuga.net/boyska/circolog"
|
|
|
"github.com/gorilla/websocket"
|
|
|
"gopkg.in/mcuadros/go-syslog.v2/format"
|
|
|
)
|
|
|
|
|
|
-func setupHttp(hub Hub) {
|
|
|
+func setupHttp(hub circolog.Hub) {
|
|
|
http.HandleFunc("/", getHTTPHandler(hub))
|
|
|
http.HandleFunc("/ws", getWSHandler(hub))
|
|
|
}
|
|
|
|
|
|
-func getHTTPHandler(hub Hub) http.HandlerFunc {
|
|
|
+func getHTTPHandler(hub circolog.Hub) http.HandlerFunc {
|
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
|
- client := Client{
|
|
|
+ client := circolog.Client{
|
|
|
Messages: make(chan format.LogParts),
|
|
|
Nofollow: true}
|
|
|
hub.Register <- client
|
|
@@ -32,7 +33,7 @@ func getHTTPHandler(hub Hub) http.HandlerFunc {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-func getWSHandler(hub Hub) http.HandlerFunc {
|
|
|
+func getWSHandler(hub circolog.Hub) http.HandlerFunc {
|
|
|
var upgrader = websocket.Upgrader{
|
|
|
ReadBufferSize: 1024,
|
|
|
WriteBufferSize: 1024,
|
|
@@ -42,12 +43,12 @@ func getWSHandler(hub Hub) http.HandlerFunc {
|
|
|
if err != nil {
|
|
|
return
|
|
|
}
|
|
|
- client := Client{Messages: make(chan format.LogParts)}
|
|
|
+ client := circolog.Client{Messages: make(chan format.LogParts)}
|
|
|
hub.Register <- client
|
|
|
|
|
|
// Allow collection of memory referenced by the caller by doing all work in
|
|
|
// new goroutines.
|
|
|
- go func(conn *websocket.Conn, c Client) {
|
|
|
+ go func(conn *websocket.Conn, c circolog.Client) {
|
|
|
defer func() {
|
|
|
hub.Unregister <- c
|
|
|
conn.Close()
|