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.

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

Dev cleanup dep #78

Merged
merged 2 commits into from
May 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 1 addition & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@ VERSION = $(shell git describe --tags)
BUILD_TIME = $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
WEBCONSOLE_COMMIT_HASH = $(shell git submodule status | grep $(WEBCONSOLE) | awk '{print $$(1)}' | cut -c1-8)
WEBCONSOLE_COMMIT_TIME = $(shell git log --pretty="%ai" -1 | awk '{time=$$(1)"T"$$(2)"Z"; print time}')
WEBCONSOLE_LDFLAGS = -X github.com/free5gc/version.VERSION=$(VERSION) \
-X github.com/free5gc/version.BUILD_TIME=$(BUILD_TIME) \
-X github.com/free5gc/version.COMMIT_HASH=$(WEBCONSOLE_COMMIT_HASH) \
-X github.com/free5gc/version.COMMIT_TIME=$(WEBCONSOLE_COMMIT_TIME)

.PHONY: $(NF) clean docker-build docker-push

Expand All @@ -53,7 +49,7 @@ $(WEBCONSOLE): $(GO_BIN_PATH)/$(WEBCONSOLE)

$(GO_BIN_PATH)/$(WEBCONSOLE): server.go $(WEBCONSOLE_GO_FILES)
@echo "Start building $(@F)...."
go build -ldflags "$(WEBCONSOLE_LDFLAGS)" -o $(ROOT_PATH)/$@ ./server.go
go build -o $(ROOT_PATH)/$@ ./server.go

vpath %.go $(addprefix $(GO_SRC_PATH)/, $(GO_NF))

Expand Down
2 changes: 1 addition & 1 deletion backend/factory/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
package factory

import (
"github.com/free5gc/logger_util"
"github.com/omec-project/logger_util"
)

type Config struct {
Expand Down
4 changes: 2 additions & 2 deletions backend/logger/logger.go
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/free5gc/logger_conf"
"github.com/free5gc/logger_util"
"github.com/omec-project/logger_conf"
"github.com/omec-project/logger_util"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions backend/webui_context/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (

"github.com/mitchellh/mapstructure"

"github.com/free5gc/MongoDBLibrary"
"github.com/free5gc/openapi/models"
"github.com/omec-project/MongoDBLibrary"
"github.com/omec-project/openapi/models"
"github.com/omec-project/webconsole/backend/logger"
)

Expand Down
27 changes: 5 additions & 22 deletions backend/webui_service/webui_init.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,11 @@ import (
_ "net/http"
_ "net/http/pprof"

"github.com/free5gc/MongoDBLibrary"
mongoDBLibLogger "github.com/free5gc/MongoDBLibrary/logger"
"github.com/free5gc/logger_util"
openApiLogger "github.com/free5gc/openapi/logger"
"github.com/free5gc/path_util"
pathUtilLogger "github.com/free5gc/path_util/logger"
"github.com/omec-project/MongoDBLibrary"
mongoDBLibLogger "github.com/omec-project/MongoDBLibrary/logger"
"github.com/omec-project/logger_util"
"github.com/omec-project/path_util"
pathUtilLogger "github.com/omec-project/path_util/logger"
"github.com/omec-project/webconsole/backend/factory"
"github.com/omec-project/webconsole/backend/logger"
"github.com/omec-project/webconsole/backend/webui_context"
Expand Down Expand Up @@ -125,22 +124,6 @@ func (webui *WEBUI) setLogLevel() {
pathUtilLogger.SetReportCaller(factory.WebUIConfig.Logger.PathUtil.ReportCaller)
}

if factory.WebUIConfig.Logger.OpenApi != nil {
if factory.WebUIConfig.Logger.OpenApi.DebugLevel != "" {
if level, err := logrus.ParseLevel(factory.WebUIConfig.Logger.OpenApi.DebugLevel); err != nil {
openApiLogger.OpenApiLog.Warnf("OpenAPI Log level [%s] is invalid, set to [info] level",
factory.WebUIConfig.Logger.OpenApi.DebugLevel)
openApiLogger.SetLogLevel(logrus.InfoLevel)
} else {
openApiLogger.SetLogLevel(level)
}
} else {
openApiLogger.OpenApiLog.Warnln("OpenAPI Log level not set. Default set to [info] level")
openApiLogger.SetLogLevel(logrus.InfoLevel)
}
openApiLogger.SetReportCaller(factory.WebUIConfig.Logger.OpenApi.ReportCaller)
}

if factory.WebUIConfig.Logger.MongoDBLibrary != nil {
if factory.WebUIConfig.Logger.MongoDBLibrary.DebugLevel != "" {
if level, err := logrus.ParseLevel(factory.WebUIConfig.Logger.MongoDBLibrary.DebugLevel); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion configapi/api_slice_mgmt.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"math"
"strings"

"github.com/free5gc/http_wrapper"
"github.com/omec-project/http_wrapper"
"github.com/gin-gonic/gin"
"github.com/omec-project/webconsole/backend/logger"
"github.com/omec-project/webconsole/configmodels"
Expand Down
4 changes: 2 additions & 2 deletions configapi/api_sub_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"github.com/gin-gonic/gin"
"go.mongodb.org/mongo-driver/bson"

"github.com/free5gc/MongoDBLibrary"
"github.com/free5gc/openapi/models"
"github.com/omec-project/MongoDBLibrary"
"github.com/omec-project/openapi/models"
"github.com/omec-project/webconsole/backend/logger"
"github.com/omec-project/webconsole/backend/webui_context"
"github.com/omec-project/webconsole/configmodels"
Expand Down
13 changes: 0 additions & 13 deletions configapi/go.mod

This file was deleted.

4 changes: 0 additions & 4 deletions configapi/go.mod.license

This file was deleted.

4 changes: 0 additions & 4 deletions configapi/go.sum.license

This file was deleted.

2 changes: 1 addition & 1 deletion configmodels/config_msg.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package configmodels

import (
"github.com/free5gc/openapi/models"
"github.com/omec-project/openapi/models"
)

const (
Expand Down
5 changes: 0 additions & 5 deletions configmodels/go.mod

This file was deleted.

3 changes: 0 additions & 3 deletions configmodels/go.mod.license

This file was deleted.

Loading