log errors in api handler (#179)

* log errors in api handler * capitalize error msg use code
cossacklabs · May 29, 2018 · 5cf40e8 · 5cf40e8
1 parent 29d1940
commit 5cf40e8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/cmd/acra-server/client_commands_session.go b/cmd/acra-server/client_commands_session.go
@@ -15,22 +15,24 @@ package main
 
 import (
 	"bufio"
-	"github.com/cossacklabs/acra/logging"
-	log "github.com/sirupsen/logrus"
 	"net"
 	"net/http"
 
+	"github.com/cossacklabs/acra/logging"
+	log "github.com/sirupsen/logrus"
+
 	"encoding/json"
 	"errors"
 	"flag"
 	"fmt"
+	"syscall"
+
 	"github.com/cossacklabs/acra/cmd"
 	"github.com/cossacklabs/acra/keystore"
 	"github.com/cossacklabs/acra/utils"
 	"github.com/cossacklabs/acra/zone"
 	"github.com/cossacklabs/themis/gothemis/cell"
 	"github.com/cossacklabs/themis/gothemis/keys"
-	"syscall"
 )
 
 const (
@@ -85,9 +87,13 @@ func (clientSession *ClientCommandsSession) HandleSession() {
 	case "/getNewZone":
 		log.Debugln("Got /getNewZone request")
 		id, publicKey, err := clientSession.keystorage.GenerateZoneKey()
-		if err == nil {
+		if err != nil {
+			log.WithError(err).WithField(logging.FieldKeyEventCode, logging.EventCodeErrorCantGenerateZone).Errorln("Can't generate zone key")
+		} else {
 			zoneData, err := zone.ZoneDataToJson(id, &keys.PublicKey{Value: publicKey})
-			if err == nil {
+			if err != nil {
+				log.WithField(logging.FieldKeyEventCode, logging.EventCodeErrorCantGenerateZone).WithError(err).Errorln("Can't create json with zone key")
+			} else {
 				log.Debugln("Handled request correctly")
 				response = fmt.Sprintf("HTTP/1.1 200 OK Found\r\n\r\n%s\r\n\r\n", string(zoneData))
 			}

diff --git a/logging/event_codes.go b/logging/event_codes.go
@@ -74,4 +74,7 @@ const (
 	EventCodeErrorDecryptorCantInitializeTLS                 = 584
 	EventCodeErrorDecryptorCantSetDeadlineToClientConnection = 585
 	EventCodeErrorDecryptorCantDecryptSymmetricKey           = 586
+
+	// api
+	EventCodeErrorCantGenerateZone = 590
 )