Code Review
/
ric-plt
/
e2mgr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add release yaml file for ric-plt-e2mgr:3.0.1"
[ric-plt/e2mgr.git]
/
E2Manager
/
configuration
/
configuration.go
diff --git
a/E2Manager/configuration/configuration.go
b/E2Manager/configuration/configuration.go
index
5bca875
..
43fbd71
100644
(file)
--- a/
E2Manager/configuration/configuration.go
+++ b/
E2Manager/configuration/configuration.go
@@
-13,7
+13,10
@@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
-//
+
+// This source code is part of the near-RT RIC (RAN Intelligent Controller)
+// platform project (RICP).
+
package configuration
package configuration
@@
-34,7
+37,10
@@
type Configuration struct {
MaxMsgSize int
}
NotificationResponseBuffer int
MaxMsgSize int
}
NotificationResponseBuffer int
- BigRedButtonTimeoutSec int
+ BigRedButtonTimeoutSec int
+ MaxConnectionAttempts int
+ MaxRnibConnectionAttempts int
+ RnibRetryIntervalMs int
}
func ParseConfiguration() *Configuration{
}
func ParseConfiguration() *Configuration{
@@
-43,9
+49,10
@@
func ParseConfiguration() *Configuration{
viper.AddConfigPath("E2Manager/resources/")
viper.AddConfigPath("./resources/") //For production
viper.AddConfigPath("../resources/") //For test under Docker
viper.AddConfigPath("E2Manager/resources/")
viper.AddConfigPath("./resources/") //For production
viper.AddConfigPath("../resources/") //For test under Docker
+ viper.AddConfigPath("../../resources/") //For test under Docker
err := viper.ReadInConfig()
if err != nil {
err := viper.ReadInConfig()
if err != nil {
- panic(fmt.Sprintf("#
http_server.p
arseConfiguration - failed to read configuration file: %s\n", err))
+ panic(fmt.Sprintf("#
configuration.P
arseConfiguration - failed to read configuration file: %s\n", err))
}
config := Configuration{}
}
config := Configuration{}
@@
-55,27
+62,29
@@
func ParseConfiguration() *Configuration{
config.NotificationResponseBuffer = viper.GetInt("notificationResponseBuffer")
config.BigRedButtonTimeoutSec = viper.GetInt("bigRedButtonTimeoutSec")
config.NotificationResponseBuffer = viper.GetInt("notificationResponseBuffer")
config.BigRedButtonTimeoutSec = viper.GetInt("bigRedButtonTimeoutSec")
-
+ config.MaxConnectionAttempts = viper.GetInt("maxConnectionAttempts")
+ config.MaxRnibConnectionAttempts = viper.GetInt("maxRnibConnectionAttempts")
+ config.RnibRetryIntervalMs = viper.GetInt("rnibRetryIntervalMs")
return &config
}
func (c *Configuration)fillLoggingConfig(logConfig *viper.Viper) {
if logConfig == nil {
return &config
}
func (c *Configuration)fillLoggingConfig(logConfig *viper.Viper) {
if logConfig == nil {
- panic(fmt.Sprintf("#
http_server
.fillLoggingConfig - failed to fill logging configuration: The entry 'logging' not found\n"))
+ panic(fmt.Sprintf("#
configuration
.fillLoggingConfig - failed to fill logging configuration: The entry 'logging' not found\n"))
}
c.Logging.LogLevel = logConfig.GetString("logLevel")
}
func (c *Configuration)fillHttpConfig(httpConfig *viper.Viper) {
if httpConfig == nil {
}
c.Logging.LogLevel = logConfig.GetString("logLevel")
}
func (c *Configuration)fillHttpConfig(httpConfig *viper.Viper) {
if httpConfig == nil {
- panic(fmt.Sprintf("#
http_server
.fillHttpConfig - failed to fill HTTP configuration: The entry 'http' not found\n"))
+ panic(fmt.Sprintf("#
configuration
.fillHttpConfig - failed to fill HTTP configuration: The entry 'http' not found\n"))
}
c.Http.Port = httpConfig.GetInt("port")
}
func (c *Configuration)fillRmrConfig(rmrConfig *viper.Viper) {
if rmrConfig == nil {
}
c.Http.Port = httpConfig.GetInt("port")
}
func (c *Configuration)fillRmrConfig(rmrConfig *viper.Viper) {
if rmrConfig == nil {
- panic(fmt.Sprintf("#
http_server
.fillRmrConfig - failed to fill RMR configuration: The entry 'rmr' not found\n"))
+ panic(fmt.Sprintf("#
configuration
.fillRmrConfig - failed to fill RMR configuration: The entry 'rmr' not found\n"))
}
c.Rmr.Port = rmrConfig.GetInt("port")
c.Rmr.MaxMsgSize = rmrConfig.GetInt("maxMsgSize")
}
c.Rmr.Port = rmrConfig.GetInt("port")
c.Rmr.MaxMsgSize = rmrConfig.GetInt("maxMsgSize")