From 8653c323674c83366f80cd3a18d9e9f0c1ea3253 Mon Sep 17 00:00:00 2001 From: Pascal Fischer Date: Thu, 21 Sep 2023 16:42:44 +0200 Subject: [PATCH] logger and first client --- client/ios/netbird/client.go | 11 ++++------- client/ios/netbird/logger.go | 31 +++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 7 deletions(-) create mode 100644 client/ios/netbird/logger.go diff --git a/client/ios/netbird/client.go b/client/ios/netbird/client.go index 3c8998813..18779312c 100644 --- a/client/ios/netbird/client.go +++ b/client/ios/netbird/client.go @@ -61,27 +61,24 @@ type Client struct { ctxCancelLock *sync.Mutex deviceName string routeListener routemanager.RouteListener - logger CustomLogger onHostDnsFn func([]string) } // NewClient instantiate a new Client -func NewClient(cfgFile, deviceName string, iFaceDiscover IFaceDiscover, routeListener RouteListener, logger CustomLogger) *Client { +func NewClient(cfgFile, deviceName string, iFaceDiscover IFaceDiscover, routeListener RouteListener) *Client { return &Client{ cfgFile: cfgFile, deviceName: deviceName, iFaceDiscover: iFaceDiscover, recorder: peer.NewRecorder(""), ctxCancelLock: &sync.Mutex{}, - logger: logger, routeListener: routeListener, } } // Run start the internal client. It is a blocker function -// func (c *Client) Run(fd int32, dns *DNSList, dnsReadyListener DnsReadyListener) error { func (c *Client) Run(fd int32, dns *DNSList, dnsReadyListener DnsReadyListener) error { - c.logger.Info("Starting NetBird client") + log.Infof("Starting NetBird client") cfg, err := internal.UpdateOrCreateConfig(internal.ConfigInput{ ConfigPath: c.cfgFile, }) @@ -100,12 +97,12 @@ func (c *Client) Run(fd int32, dns *DNSList, dnsReadyListener DnsReadyListener) auth := NewAuthWithConfig(ctx, cfg) // err = auth.login(urlOpener) - auth.loginWithSetupKeyAndSaveConfig("E9EEBA50-76A1-4C72-A939-C10655C1CC09", "iPhone") + auth.loginWithSetupKeyAndSaveConfig("C3803F45-435B-4333-96EB-50F9EC723355", "iPhone") if err != nil { return err } - c.logger.Info("Auth successful") + log.Infof("Auth successful") // todo do not throw error in case of cancelled context ctx = internal.CtxInitState(ctx) c.onHostDnsFn = func([]string) {} diff --git a/client/ios/netbird/logger.go b/client/ios/netbird/logger.go new file mode 100644 index 000000000..96b75d7d3 --- /dev/null +++ b/client/ios/netbird/logger.go @@ -0,0 +1,31 @@ +package netbird + +import ( + "os" + + "github.com/netbirdio/netbird/util" +) + +var logFile *os.File + +// InitializeLog initializes the log file. +func InitializeLog(logLevel string, filePath string) error { + var err error + err = util.InitLog(logLevel, filePath) + return err +} + +// // CloseLog closes the log file. +// func CloseLog() { +// if logFile != nil { +// logFile.Close() +// } +// } +// +// // Log writes a message to the log file. +// func Log(message string) { +// if logFile != nil { +// ts := time.Now().Format(time.RFC3339) +// fmt.Fprintf(logFile, "%s: %s\n", ts, message) +// } +// }