-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor and update util to use new log formatter setting
- Loading branch information
1 parent
e777e4e
commit 664622a
Showing
37 changed files
with
4,035 additions
and
2,768 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,69 +1,94 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "os" | ||
| "path/filepath" | ||
| "runtime/debug" | ||
|
|
||
| "github.com/asaskevich/govalidator" | ||
| "github.com/urfave/cli" | ||
|
|
||
| "github.com/free5gc/n3iwf/internal/logger" | ||
| "github.com/free5gc/n3iwf/pkg/factory" | ||
| "github.com/free5gc/n3iwf/pkg/service" | ||
| logger_util "github.com/free5gc/util/logger" | ||
| "github.com/free5gc/util/version" | ||
| ) | ||
|
|
||
| var N3IWF = &service.N3IWF{} | ||
| var N3IWF *service.N3iwfApp | ||
|
|
||
| func main() { | ||
| defer func() { | ||
| if p := recover(); p != nil { | ||
| // Print stack for panic to log. Fatalf() will let program exit. | ||
| logger.AppLog.Fatalf("panic: %v\n%s", p, string(debug.Stack())) | ||
| logger.MainLog.Fatalf("panic: %v\n%s", p, string(debug.Stack())) | ||
| } | ||
| }() | ||
|
|
||
| app := cli.NewApp() | ||
| app.Name = "n3iwf" | ||
| app.Usage = "Non-3GPP Interworking Function (N3IWF)" | ||
| app.Action = action | ||
| app.Flags = N3IWF.GetCliCmd() | ||
| app.Flags = []cli.Flag{ | ||
| cli.StringFlag{ | ||
| Name: "config, c", | ||
| Usage: "Load configuration from `FILE`", | ||
| }, | ||
| cli.StringSliceFlag{ | ||
| Name: "log, l", | ||
| Usage: "Output NF log to `FILE`", | ||
| }, | ||
| } | ||
| if err := app.Run(os.Args); err != nil { | ||
| logger.AppLog.Errorf("N3IWF Run Error: %v\n", err) | ||
| logger.MainLog.Errorf("N3IWF Run Error: %v\n", err) | ||
| } | ||
| } | ||
|
|
||
| func action(c *cli.Context) error { | ||
| if err := initLogFile(c.String("log"), c.String("log5gc")); err != nil { | ||
| logger.AppLog.Errorf("%+v", err) | ||
| func action(cliCtx *cli.Context) error { | ||
| tlsKeyLogPath, err := initLogFile(cliCtx.StringSlice("log")) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if err := N3IWF.Initialize(c); err != nil { | ||
| switch errType := err.(type) { | ||
| case govalidator.Errors: | ||
| validErrs := err.(govalidator.Errors).Errors() | ||
| for _, validErr := range validErrs { | ||
| logger.CfgLog.Errorf("%+v", validErr) | ||
| } | ||
| default: | ||
| logger.CfgLog.Errorf("%+v", errType) | ||
| } | ||
| logger.CfgLog.Errorf("[-- PLEASE REFER TO SAMPLE CONFIG FILE COMMENTS --]") | ||
| return fmt.Errorf("Failed to initialize !!") | ||
| logger.MainLog.Infoln("N3IWF version: ", version.GetVersion()) | ||
|
|
||
| cfg, err := factory.ReadConfig(cliCtx.String("config")) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| factory.N3iwfConfig = cfg | ||
|
|
||
| logger.AppLog.Infoln(c.App.Name) | ||
| logger.AppLog.Infoln("N3IWF version: ", version.GetVersion()) | ||
| n3iwf, err := service.NewApp(cfg) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| N3IWF = n3iwf | ||
|
|
||
| N3IWF.Start() | ||
| n3iwf.Start(tlsKeyLogPath) | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func initLogFile(logNfPath, log5gcPath string) error { | ||
| if err := logger.LogFileHook(logNfPath, log5gcPath); err != nil { | ||
| return err | ||
| func initLogFile(logNfPath []string) (string, error) { | ||
| logTlsKeyPath := "" | ||
|
|
||
| for _, path := range logNfPath { | ||
| if err := logger_util.LogFileHook(logger.Log, path); err != nil { | ||
| return "", err | ||
| } | ||
|
|
||
| if logTlsKeyPath != "" { | ||
| continue | ||
| } | ||
|
|
||
| nfDir, _ := filepath.Split(path) | ||
| tmpDir := filepath.Join(nfDir, "key") | ||
| if err := os.MkdirAll(tmpDir, 0o775); err != nil { | ||
| logger.InitLog.Errorf("Make directory %s failed: %+v", tmpDir, err) | ||
| return "", err | ||
| } | ||
| _, name := filepath.Split(factory.N3iwfDefaultTLSKeyLogPath) | ||
| logTlsKeyPath = filepath.Join(tmpDir, name) | ||
| } | ||
| return nil | ||
|
|
||
| return logTlsKeyPath, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,44 @@ | ||
| module github.com/free5gc/n3iwf | ||
|
|
||
| go 1.14 | ||
| go 1.17 | ||
|
|
||
| require ( | ||
| git.cs.nctu.edu.tw/calee/sctp v1.1.0 | ||
| github.com/antonfisher/nested-logrus-formatter v1.3.1 | ||
| github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d | ||
| github.com/free5gc/aper v1.0.4 | ||
| github.com/free5gc/ngap v1.0.6 | ||
| github.com/free5gc/util v1.0.3 | ||
| github.com/free5gc/util v1.0.4 | ||
| github.com/sirupsen/logrus v1.8.1 | ||
| github.com/urfave/cli v1.22.5 | ||
| github.com/vishvananda/netlink v1.1.0 | ||
| github.com/wmnsk/go-gtp v0.8.0 | ||
| github.com/wmnsk/go-gtp v0.7.28 | ||
| golang.org/x/net v0.7.0 | ||
| golang.org/x/sys v0.5.0 | ||
| gopkg.in/yaml.v2 v2.4.0 | ||
| ) | ||
|
|
||
| require ( | ||
| github.com/antonfisher/nested-logrus-formatter v1.3.1 // indirect | ||
| github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d // indirect | ||
| github.com/free5gc/openapi v1.0.4 // indirect | ||
| github.com/gin-contrib/sse v0.1.0 // indirect | ||
| github.com/gin-gonic/gin v1.7.7 // indirect | ||
| github.com/go-playground/locales v0.13.0 // indirect | ||
| github.com/go-playground/universal-translator v0.17.0 // indirect | ||
| github.com/go-playground/validator/v10 v10.4.1 // indirect | ||
| github.com/golang-jwt/jwt v3.2.1+incompatible // indirect | ||
| github.com/golang/protobuf v1.5.2 // indirect | ||
| github.com/json-iterator/go v1.1.11 // indirect | ||
| github.com/leodido/go-urn v1.2.0 // indirect | ||
| github.com/mattn/go-isatty v0.0.12 // indirect | ||
| github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect | ||
| github.com/modern-go/reflect2 v1.0.1 // indirect | ||
| github.com/pkg/errors v0.9.1 // indirect | ||
| github.com/russross/blackfriday/v2 v2.0.1 // indirect | ||
| github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect | ||
| github.com/tim-ywliu/nested-logrus-formatter v1.3.2 // indirect | ||
| github.com/ugorji/go/codec v1.1.7 // indirect | ||
| github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df // indirect | ||
| golang.org/x/crypto v0.1.0 // indirect | ||
| google.golang.org/protobuf v1.26.0 // indirect | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.