From f2e25cb40276a65f62b2cea75f6c562a26c65aed Mon Sep 17 00:00:00 2001 From: kalipso Date: Thu, 10 Oct 2024 10:26:33 +0200 Subject: [PATCH] rpc use new logger --- rpc/rpc.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rpc/rpc.go b/rpc/rpc.go index 6c67fa0..065c5e4 100644 --- a/rpc/rpc.go +++ b/rpc/rpc.go @@ -13,6 +13,7 @@ import ( "github.com/k4lipso/pentapass/storage" "github.com/k4lipso/pentapass/crypto" "github.com/k4lipso/pentapass/crypto/age" + . "github.com/k4lipso/pentapass/internal/log" ) var StorageHandler *storage.StorageHandler @@ -95,7 +96,7 @@ func (t *Query) AddPeer(np *NamespacePeer, success *bool) error { peer, err := storage.PeerFromString(np.Peer) if err != nil { - fmt.Printf("Error parsing peer string: %s\n", err) + Logger.Infof("Error parsing peer string: %s\n", err) *success = false return err } @@ -117,7 +118,7 @@ func (t *Query) DeletePeer(np *NamespacePeer, success *bool) error { peer, err := storage.PeerFromString(np.Peer) if err != nil { - fmt.Printf("Error parsing peer string: %s\n", err) + Logger.Infof("Error parsing peer string: %s\n", err) *success = false return err } @@ -162,8 +163,7 @@ func (t *Query) ListNamespaces(_ *int, reply *[]string) error { } func (t *Query) GetAllNames(namespace *string, reply *[]string) error { - fmt.Println("RPC Request: Query::LoadedTriggers") - fmt.Printf("Listing content of %s", *namespace) + Logger.Infof("Listing content of %s", *namespace) val, ok := StorageHandler.Namespaces[*namespace] @@ -182,7 +182,7 @@ func Serve(path string) { l, err := net.Listen("unix", path + "/rpc_test.socket") if err != nil { - fmt.Printf("Error while listening on unix socket: %s\n", err) + Logger.Errorf("Error while listening on unix socket: %s\n", err) } go http.Serve(l, nil) @@ -191,7 +191,7 @@ func Serve(path string) { signal.Notify(sigc, os.Interrupt, syscall.SIGTERM) func(ln net.Listener, c chan os.Signal) { sig := <-c - fmt.Printf("Caught signal %s: shutting down.\n", sig) + Logger.Infof("Caught signal %s: shutting down.\n", sig) ln.Close() os.Exit(0) }(l, sigc) @@ -201,7 +201,7 @@ func Receive(path string) (*rpc.Client, error) { client, err := rpc.DialHTTP("unix", path + "/rpc_test.socket") if err != nil { - fmt.Printf("Cant connect to RPC server: %s\n", err) + Logger.Errorf("Cant connect to RPC server: %s\n", err) } return client, err