Commit 825862de authored by Yakubov, Sergey's avatar Yakubov, Sergey
Browse files

add an option to write logs to file

parent be1f3d04

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ stages: 
variables:

  GIT_STRATEGY: clone

  CONTAINER_RDM_URL: "${CI_REGISTRY_IMAGE}/remote-data-broker"

  TAG: 0.3.0

  TAG: 0.4.0



# This import is for the func_rse_docker_* functions

before_script:

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "ORNL") 
SET(CPACK_RPM_PACKAGE_MAINTAINER "ORNL")



set(CPACK_PACKAGE_VERSION_MAJOR "0")

set(CPACK_PACKAGE_VERSION_MINOR "3")

set(CPACK_PACKAGE_VERSION_MINOR "4")

set(CPACK_PACKAGE_VERSION_PATCH "0")



INCLUDE(CPack)

src/common/settings.go

+14 −10
Original line number Diff line number Diff line
@@ -29,12 +29,12 @@ type serverSettings struct { 
		Enabled bool

		Queue   string

	}

	LogLevel string

	LogSettings log.LogSettings

}



var Settings serverSettings



func ReadConfig(fname string) (log.Level, error) {

func ReadConfig(fname string) error {

	// need to set defaults for all nested values, othervise Viper does not read them from environment!

	viper.SetDefault("CatCommand", "cat $filename")

	viper.SetDefault("DeleteCommand", "delete $filename")
@@ -47,23 +47,27 @@ func ReadConfig(fname string) (log.Level, error) { 
	viper.SetDefault("Rmq.Url", "amqp://guest:guest@127.0.0.1:5672")

	viper.SetDefault("RmqClient.Queue", "test")

	viper.SetDefault("RmqClient.Enabled", true)

	viper.SetDefault("LogLevel", "debug")

	viper.SetDefault("LogSettings.Level", "debug")

	viper.SetDefault("LogSettings.LogToFile", false)

	viper.SetDefault("LogSettings.FileFolder", "/var/logs/pulsar")

	viper.SetDefault("LogSettings.MaxSize", 5)

	viper.SetDefault("LogSettings.MaxBackups", 3)

	viper.SetDefault("Auth.Enabled", false)

	viper.SetDefault("Auth.UserList", []string{})

	viper.SetDefault("Auth.JwksUrl", "")



	if fname != "" {

		viper.SetConfigFile(fname)

		viper.ReadInConfig()

		err := viper.ReadInConfig()

		if err != nil {

			return err

		}



	}

	viper.SetEnvPrefix("NDIP")

	viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))

	viper.AutomaticEnv()

	if err := viper.Unmarshal(&Settings); err != nil {

		return log.FatalLevel, err

	}



	level, err := log.LevelFromString(Settings.LogLevel)



	return level, err

	res := viper.Unmarshal(&Settings)

	return res

}

src/go.mod

+1 −0
Original line number Diff line number Diff line
@@ -11,4 +11,5 @@ require ( 
	github.com/spf13/viper v1.16.0

	github.com/stretchr/testify v1.8.4

	golang.org/x/sys v0.9.0 // indirect

	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect

)

src/go.sum

+2 −0
Original line number Diff line number Diff line
@@ -1707,6 +1707,8 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EV 
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=

gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=

gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=

gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=

gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=

gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=