logging cleanup

net/server/internal/api_setProfile.go

@@ -8,22 +8,22 @@ import (
 
 func SetProfile(w http.ResponseWriter, r *http.Request) {
 
-  account, res := BearerAppToken(r, true);
+  account, err := BearerAppToken(r, true);
-  if res != nil {
+  if err != nil {
-    w.WriteHeader(http.StatusUnauthorized)
+    ErrResponse(w, http.StatusUnauthorized, err)
     return
   }
   if account.Disabled {
-    w.WriteHeader(http.StatusGone);
+    ErrResponse(w, http.StatusGone, nil)
     return
   }
   detail := account.AccountDetail
 
   // extract profile data from body
   var profileData ProfileData;
-  err := ParseRequest(r, w, &profileData)
+  err = ParseRequest(r, w, &profileData)
   if err != nil {
-    w.WriteHeader(http.StatusBadRequest)
+    ErrResponse(w, http.StatusBadRequest, err)
     return
   }
 
@@ -42,9 +42,7 @@ func SetProfile(w http.ResponseWriter, r *http.Request) {
     return nil
   })
   if err != nil {
-    PrintMsg(err)
+    ErrResponse(w, http.StatusInternalServerError, err)
-    LogMsg("failed to store profile")
-    w.WriteHeader(http.StatusInternalServerError)
     return
   }
 

net/server/internal/api_status.go

@@ -1,7 +1,7 @@
 package databag
 
 import (
-  "log"
+  "errors"
   "sync"
 	"net/http"
   "encoding/json"
@@ -30,27 +30,31 @@ func Status(w http.ResponseWriter, r *http.Request) {
   // accept websocket connection
   conn, err := upgrader.Upgrade(w, r, nil)
   if err != nil {
-      log.Println("Status: failed upgrade connection")
+    ErrMsg(err)
-      return
+    return
   }
   defer conn.Close()
 
   // receive announce
-	t, m, err := conn.ReadMessage()
+	t, m, res := conn.ReadMessage()
-  if t != websocket.TextMessage || err != nil {
+  if res != nil {
-    LogMsg("failed to receive announce")
+    ErrMsg(res)
+    return
+  }
+  if t != websocket.TextMessage {
+    ErrMsg(errors.New("invalid websocket message type"))
     return
 	}
-	var announce Announce
+	var a Announce
-	if json.Unmarshal(m, &announce) != nil {
+	if err := json.Unmarshal(m, &a); err != nil {
-    LogMsg("invalid announce")
+    ErrMsg(err)
     return
 	}
 
   // retrieve reference account
   var app store.App
-  if store.DB.Preload("Account").Where("token = ?", announce.AppToken).First(&app).Error != nil {
+  if err := store.DB.Preload("Account").Where("token = ?", a.AppToken).First(&app).Error; err != nil {
-    LogMsg("invalid app token")
+    ErrMsg(err)
     return
   }
 
@@ -59,12 +63,11 @@ func Status(w http.ResponseWriter, r *http.Request) {
   var msg []byte
   msg, err = json.Marshal(rev)
   if err != nil {
-    log.Println("Status - failed to marshal revision")
+    ErrMsg(err)
     return
   }
-  err = conn.WriteMessage(websocket.TextMessage, msg)
+  if err := conn.WriteMessage(websocket.TextMessage, msg); err != nil {
-  if err != nil {
+    ErrMsg(err)
-    log.Println("Status - failed to send initial revision")
     return
   }
 
@@ -80,13 +83,12 @@ func Status(w http.ResponseWriter, r *http.Request) {
   for {
 		select {
 		case msg := <-c:
-      err = conn.WriteMessage(websocket.TextMessage, msg)
+      if err := conn.WriteMessage(websocket.TextMessage, msg); err != nil {
-      if err != nil {
+        ErrMsg(err)
-        log.Println("Status - failed to send revision, closing")
         return
       }
 		case <-wsExit:
-			log.Println("Status - server exit")
+			LogMsg("exiting server")
       wsExit<-true
 			return
 		}
@@ -115,7 +117,7 @@ func SetStatus(account store.Account) {
   rev := getRevision(account);
   msg, err := json.Marshal(rev)
   if err != nil {
-    log.Println("SetStatus - failed to marshal revision")
+    ErrMsg(err)
     return
   }
 

net/server/internal/logger.go

@@ -37,6 +37,20 @@ func Logger(inner http.Handler, name string) http.Handler {
     })
 }
 
+func ErrResponse(w http.ResponseWriter, code int, err error) {
+  ErrMsg(err)
+  w.WriteHeader(code)
+}
+
+func ErrMsg(err error) {
+  if !hideLog && err != nil {
+    _, file, line, _ := runtime.Caller(1)
+    p, _ := os.Getwd()
+    log.Printf("%s:%d %s", strings.TrimPrefix(file, p), line, err.Error())
+    pretty.Println(err)
+  }
+}
+
 func LogMsg(msg string) {
   if !hideLog {
     _, file, line, _ := runtime.Caller(1)

net/server/internal/status_test.go

@@ -0,0 +1,21 @@
+package databag
+
+import (
+  "net/url"
+  "net/http"
+  "net/http/httptest"
+)
+
+type StatusHandler struct {}
+
+func (h *StatusHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+  Status(w, r)
+}
+
+func StartTestWebsocketServer() string {
+  h := StatusHandler{}
+  s := httptest.NewServer(&h)
+  wsUrl, _ := url.Parse(s.URL)
+  wsUrl.Scheme = "ws"
+  return wsUrl.String()
+}

net/server/internal/ucAttachApp_test.go

@@ -9,26 +9,14 @@ import (
   "crypto/rsa"
   "crypto"
   "time"
-  "net/url"
-  "net/http"
-  "net/http/httptest"
   "github.com/stretchr/testify/assert"
 	"github.com/gorilla/websocket"
 )
 
-type StatusHandler struct {}
-
-func (h *StatusHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-  Status(w, r)
-}
-
 func TestAttachAccount(t *testing.T) {
 
   // setup websocket server
-  h := StatusHandler{}
+  wsUrl := StartTestWebsocketServer()
-  s := httptest.NewServer(&h)
-  wsUrl, _ := url.Parse(s.URL)
-  wsUrl.Scheme = "ws"
 
   // get account token
   r, w, _ := NewRequest("POST", "/admin/accounts", nil)
@@ -96,7 +84,7 @@ func TestAttachAccount(t *testing.T) {
   assert.Less(t, cur - 60, auth.Timestamp)
 
   // app connects websocket
-  ws, _, _ := websocket.DefaultDialer.Dial(wsUrl.String(), nil)
+  ws, _, _ := websocket.DefaultDialer.Dial(wsUrl, nil)
   announce := Announce{ AppToken: access }
   msg, _ := json.Marshal(&announce)
   ws.WriteMessage(websocket.TextMessage, msg)