Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Move to util v1.1.0 #117

Merged
merged 1 commit into from
May 31, 2024
Merged

chore: Move to util v1.1.0 #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ampolicy/routers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

"github.com/gin-gonic/gin"

"github.com/omec-project/logger_util"
logger_util "github.com/omec-project/util/logger"
"github.com/omec-project/pcf/logger"
)

Expand Down
2 changes: 1 addition & 1 deletion bdtpolicy/routers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

"github.com/gin-gonic/gin"

"github.com/omec-project/logger_util"
logger_util "github.com/omec-project/util/logger"
"github.com/omec-project/pcf/logger"
)

Expand Down
8 changes: 4 additions & 4 deletions factory/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@
package factory

import (
"github.com/omec-project/logger_util"
"github.com/omec-project/openapi/models"
"github.com/omec-project/util/logger"
)

const (
PCF_EXPECTED_CONFIG_VERSION = "1.0.0"
)

type Config struct {
Info *Info `yaml:"info"`
Configuration *Configuration `yaml:"configuration"`
Logger *logger_util.Logger `yaml:"logger"`
Info *Info `yaml:"info"`
Configuration *Configuration `yaml:"configuration"`
Logger *logger.Logger `yaml:"logger"`
}

type Info struct {
Expand Down
7 changes: 2 additions & 5 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,9 @@ require (
github.com/gin-gonic/gin v1.10.0
github.com/google/uuid v1.6.0
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
github.com/omec-project/config5g v1.3.5
github.com/omec-project/http2_util v1.2.0
github.com/omec-project/logger_conf v1.1.1
github.com/omec-project/logger_util v1.2.0
github.com/omec-project/config5g v1.4.0
github.com/omec-project/openapi v1.2.0
github.com/omec-project/util v1.0.13
github.com/omec-project/util v1.1.0
github.com/prometheus/client_golang v1.19.1
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.9.0
Expand Down
14 changes: 4 additions & 10 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,18 +82,12 @@ github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 h1:W6apQkHrMkS0Muv8G/TipAy/FJl/rCYT0+EuS8+Z0z4=
github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms=
github.com/omec-project/config5g v1.3.5 h1:6Lh8hEDOOWF9lUbiNcv5qrebko/ciF2cYRU1jT3VQ7A=
github.com/omec-project/config5g v1.3.5/go.mod h1:FLDTB4Cy8GzKvpe8Di6buLE1Y+RDu+WknzJCA5r9KMs=
github.com/omec-project/http2_util v1.2.0 h1:ggQ1GjY2x6VRpKuRhZj0t9dh6eISY6LRBv4rlMD++8s=
github.com/omec-project/http2_util v1.2.0/go.mod h1:KLgvU3o7qmG/i5XO/qITscFql2tWCAmjE6glX+dxe7M=
github.com/omec-project/logger_conf v1.1.1 h1:qo0cF5gnPfth8wy+I/QjiOx+F5jB6h4GLSOdyS+ted8=
github.com/omec-project/logger_conf v1.1.1/go.mod h1:2EwoAXjOcRTweseN+ogWifJvjocEKjz3kxRaIC4I88g=
github.com/omec-project/logger_util v1.2.0 h1:Wtx6skInAPqSic0b97QtJcs+xHDh5798MY2WRrnUz3s=
github.com/omec-project/logger_util v1.2.0/go.mod h1:LRHlDJdCqVjOxYvYslRryj0DFUNtxQkgxEiQ7fSCoPk=
github.com/omec-project/config5g v1.4.0 h1:UxwF4bXqlXcAYx+euWJoVmuP+vsLXQr8Chq68QWYswM=
github.com/omec-project/config5g v1.4.0/go.mod h1:/rF/hIDhZR+B2ytNe3bdLWASTI1wNMmC0QHdmaPVlNY=
github.com/omec-project/openapi v1.2.0 h1:7Wvi0HLvhvxMyQtqGcqtMCPC/0QCGAFP5htrXCfWxRc=
github.com/omec-project/openapi v1.2.0/go.mod h1:hjU13MB1m9MHTko87JfsUNCdeD6/m6VkNZDD8Vq5U9M=
github.com/omec-project/util v1.0.13 h1:50ghFbWo7aqhqIknC6KDPWmkht0tP1v2wjpIdcWVXKg=
github.com/omec-project/util v1.0.13/go.mod h1:Cn9P57qYFiEu0ZXti8imODsJIXVGqnqhP40MwbVbo3g=
github.com/omec-project/util v1.1.0 h1:TUuLmzqTLChIEXQlK9g5Ihgmw4FUm/UJnjfu0wT8Gz0=
github.com/omec-project/util v1.1.0/go.mod h1:BEv8nCokB4j0fgAQ6VVkKuQ2PSP3DJMEmz25pFMw5X8=
github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
Expand Down
2 changes: 1 addition & 1 deletion httpcallback/router.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

"github.com/gin-gonic/gin"

"github.com/omec-project/logger_util"
"github.com/omec-project/pcf/logger"
logger_util "github.com/omec-project/util/logger"
)

// Route is the information for every URI.
Expand Down
8 changes: 4 additions & 4 deletions logger/logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
formatter "github.com/antonfisher/nested-logrus-formatter"
"github.com/sirupsen/logrus"

"github.com/omec-project/logger_conf"
"github.com/omec-project/logger_util"
"github.com/omec-project/util/logger"
"github.com/omec-project/util/logger_conf"
)

var (
Expand Down Expand Up @@ -54,12 +54,12 @@ func init() {
FieldsOrder: []string{"component", "category"},
}

free5gcLogHook, err := logger_util.NewFileHook(logger_conf.Free5gcLogFile, os.O_CREATE|os.O_APPEND|os.O_RDWR, 0o666)
free5gcLogHook, err := logger.NewFileHook(logger_conf.Free5gcLogFile, os.O_CREATE|os.O_APPEND|os.O_RDWR, 0o666)
if err == nil {
log.Hooks.Add(free5gcLogHook)
}

selfLogHook, err := logger_util.NewFileHook(logger_conf.NfLogDir+"pcf.log", os.O_CREATE|os.O_APPEND|os.O_RDWR, 0o666)
selfLogHook, err := logger.NewFileHook(logger_conf.NfLogDir+"pcf.log", os.O_CREATE|os.O_APPEND|os.O_RDWR, 0o666)
if err == nil {
log.Hooks.Add(selfLogHook)
}
Expand Down
2 changes: 1 addition & 1 deletion oam/routers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"github.com/gin-gonic/gin"

"github.com/omec-project/logger_util"
logger_util "github.com/omec-project/util/logger"
"github.com/omec-project/pcf/logger"
)

Expand Down
2 changes: 1 addition & 1 deletion policyauthorization/routers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

"github.com/gin-gonic/gin"

"github.com/omec-project/logger_util"
logger_util "github.com/omec-project/util/logger"
"github.com/omec-project/pcf/logger"
)

Expand Down
4 changes: 2 additions & 2 deletions service/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ import (

"github.com/omec-project/config5g/proto/client"
protos "github.com/omec-project/config5g/proto/sdcoreConfig"
"github.com/omec-project/http2_util"
"github.com/omec-project/logger_util"
"github.com/omec-project/openapi/Nnrf_NFDiscovery"
"github.com/omec-project/openapi/models"
"github.com/omec-project/pcf/ampolicy"
Expand All @@ -44,7 +42,9 @@ import (
"github.com/omec-project/pcf/smpolicy"
"github.com/omec-project/pcf/uepolicy"
"github.com/omec-project/pcf/util"
"github.com/omec-project/util/http2_util"
"github.com/omec-project/util/idgenerator"
logger_util "github.com/omec-project/util/logger"
"github.com/omec-project/util/path_util"
pathUtilLogger "github.com/omec-project/util/path_util/logger"
)
Expand Down
2 changes: 1 addition & 1 deletion smpolicy/routers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

"github.com/gin-gonic/gin"

"github.com/omec-project/logger_util"
logger_util "github.com/omec-project/util/logger"
"github.com/omec-project/pcf/logger"
)

Expand Down
2 changes: 1 addition & 1 deletion uepolicy/routers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

"github.com/gin-gonic/gin"

"github.com/omec-project/logger_util"
logger_util "github.com/omec-project/util/logger"
"github.com/omec-project/pcf/logger"
)

Expand Down