adding loggers
Some checks failed
continuous-integration/drone/push Build is failing

This commit is contained in:
ycc 2024-06-05 22:23:48 +02:00
parent 050de1a0b3
commit 9b6caf4e62
4 changed files with 28 additions and 6 deletions

12
client/helpers/logger.go Normal file
View File

@ -0,0 +1,12 @@
package helpers
import (
"github.com/rs/zerolog"
)
var logger zerolog.Logger
// AddLogger sets the logger for the sublibrary
func AddLogger(l zerolog.Logger) {
logger = l
}

12
client/logger.go Normal file
View File

@ -0,0 +1,12 @@
package client
import (
"github.com/rs/zerolog"
)
var logger zerolog.Logger
// AddLogger sets the logger for the sublibrary
func AddLogger(l zerolog.Logger) {
logger = l
}

View File

@ -1,7 +1,6 @@
package client package client
import ( import (
"fmt"
"io" "io"
"os" "os"
"time" "time"
@ -206,7 +205,7 @@ func (p *Peer) AsymEncryptMessage(Message []byte) (*meowlib.EncryptedMessage, er
// fmt.Println("[AsymEncryptMessage] Signature should be verified with:", p.MyIdentity.Public) // fmt.Println("[AsymEncryptMessage] Signature should be verified with:", p.MyIdentity.Public)
enc, err := meowlib.AsymEncryptAndSign(p.ContactEncryption, p.MyIdentity.Private, Message) enc, err := meowlib.AsymEncryptAndSign(p.ContactEncryption, p.MyIdentity.Private, Message)
if err != nil { if err != nil {
fmt.Println(err.Error()) logger.Error().Err(err).Msg("Peer.AsymEncryptMessage")
return enc, err return enc, err
} }
return enc, err return enc, err
@ -219,7 +218,7 @@ func (p *Peer) AsymDecryptMessage(Message []byte, Signature []byte) (DecryptedMe
// fmt.Println("[AsymDecryptMessage] Signature will be verified with:", p.ContactPublicKey) // fmt.Println("[AsymDecryptMessage] Signature will be verified with:", p.ContactPublicKey)
DecryptedMessage, err = meowlib.AsymDecryptAndCheck(p.MyEncryptionKp.Private, p.ContactPublicKey, Message, Signature) DecryptedMessage, err = meowlib.AsymDecryptAndCheck(p.MyEncryptionKp.Private, p.ContactPublicKey, Message, Signature)
if err != nil { if err != nil {
fmt.Println(err.Error()) logger.Error().Err(err).Msg("Peer.AsymDecryptMessage")
return nil, err return nil, err
} }
return DecryptedMessage, err return DecryptedMessage, err

View File

@ -1,7 +1,6 @@
package client package client
import ( import (
"fmt"
"strings" "strings"
"time" "time"
@ -119,7 +118,7 @@ func (ints *Server) AsymEncryptMessage(Message []byte) (*meowlib.EncryptedMessag
var enc *meowlib.EncryptedMessage var enc *meowlib.EncryptedMessage
enc, err := meowlib.AsymEncryptAndSign(ints.PublicKey, ints.UserKp.Private, Message) enc, err := meowlib.AsymEncryptAndSign(ints.PublicKey, ints.UserKp.Private, Message)
if err != nil { if err != nil {
fmt.Println(err.Error()) logger.Error().Err(err).Msg("Server.AsymEncryptMessage")
return nil, err return nil, err
} }
return enc, err return enc, err
@ -129,7 +128,7 @@ func (ints *Server) AsymEncryptMessage(Message []byte) (*meowlib.EncryptedMessag
func (ints *Server) AsymDecryptMessage(Message []byte, Signature []byte) (DecryptedMessage []byte, err error) { func (ints *Server) AsymDecryptMessage(Message []byte, Signature []byte) (DecryptedMessage []byte, err error) {
DecryptedMessage, err = meowlib.AsymDecryptAndCheck(ints.UserKp.Private, ints.PublicKey, Message, Signature) DecryptedMessage, err = meowlib.AsymDecryptAndCheck(ints.UserKp.Private, ints.PublicKey, Message, Signature)
if err != nil { if err != nil {
fmt.Println(err.Error()) logger.Error().Err(err).Msg("Server.AsymDecryptMessage")
return nil, err return nil, err
} }
return DecryptedMessage, err return DecryptedMessage, err