Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
B
beego
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
go
beego
Commits
88940813
Commit
88940813
authored
Mar 27, 2018
by
qshuai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix typo
parent
f1668881
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
27 additions
and
27 deletions
+27
-27
config.go
config/config.go
+3
-3
fake.go
config/fake.go
+1
-1
ini.go
config/ini.go
+7
-7
json.go
config/json.go
+5
-5
json_test.go
config/json_test.go
+1
-1
xml.go
config/xml/xml.go
+5
-5
yaml.go
config/yaml/yaml.go
+5
-5
No files found.
config/config.go
View file @
88940813
...
...
@@ -150,12 +150,12 @@ func ExpandValueEnv(value string) (realValue string) {
}
key
:=
""
defa
lu
tV
:=
""
defa
ul
tV
:=
""
// value start with "${"
for
i
:=
2
;
i
<
vLen
;
i
++
{
if
value
[
i
]
==
'|'
&&
(
i
+
1
<
vLen
&&
value
[
i
+
1
]
==
'|'
)
{
key
=
value
[
2
:
i
]
defa
lu
tV
=
value
[
i
+
2
:
vLen
-
1
]
// other string is default value.
defa
ul
tV
=
value
[
i
+
2
:
vLen
-
1
]
// other string is default value.
break
}
else
if
value
[
i
]
==
'}'
{
key
=
value
[
2
:
i
]
...
...
@@ -165,7 +165,7 @@ func ExpandValueEnv(value string) (realValue string) {
realValue
=
os
.
Getenv
(
key
)
if
realValue
==
""
{
realValue
=
defa
lu
tV
realValue
=
defa
ul
tV
}
return
...
...
config/fake.go
View file @
88940813
...
...
@@ -126,7 +126,7 @@ func (c *fakeConfigContainer) SaveConfigFile(filename string) error {
var
_
Configer
=
new
(
fakeConfigContainer
)
// NewFakeConfig return a fake Con
g
iger
// NewFakeConfig return a fake Con
f
iger
func
NewFakeConfig
()
Configer
{
return
&
fakeConfigContainer
{
data
:
make
(
map
[
string
]
string
),
...
...
config/ini.go
View file @
88940813
...
...
@@ -215,7 +215,7 @@ func (c *IniConfigContainer) Bool(key string) (bool, error) {
}
// DefaultBool returns the boolean value for a given key.
// if err != nil return defaltval
// if err != nil return defa
u
ltval
func
(
c
*
IniConfigContainer
)
DefaultBool
(
key
string
,
defaultval
bool
)
bool
{
v
,
err
:=
c
.
Bool
(
key
)
if
err
!=
nil
{
...
...
@@ -230,7 +230,7 @@ func (c *IniConfigContainer) Int(key string) (int, error) {
}
// DefaultInt returns the integer value for a given key.
// if err != nil return defaltval
// if err != nil return defa
u
ltval
func
(
c
*
IniConfigContainer
)
DefaultInt
(
key
string
,
defaultval
int
)
int
{
v
,
err
:=
c
.
Int
(
key
)
if
err
!=
nil
{
...
...
@@ -245,7 +245,7 @@ func (c *IniConfigContainer) Int64(key string) (int64, error) {
}
// DefaultInt64 returns the int64 value for a given key.
// if err != nil return defaltval
// if err != nil return defa
u
ltval
func
(
c
*
IniConfigContainer
)
DefaultInt64
(
key
string
,
defaultval
int64
)
int64
{
v
,
err
:=
c
.
Int64
(
key
)
if
err
!=
nil
{
...
...
@@ -260,7 +260,7 @@ func (c *IniConfigContainer) Float(key string) (float64, error) {
}
// DefaultFloat returns the float64 value for a given key.
// if err != nil return defaltval
// if err != nil return defa
u
ltval
func
(
c
*
IniConfigContainer
)
DefaultFloat
(
key
string
,
defaultval
float64
)
float64
{
v
,
err
:=
c
.
Float
(
key
)
if
err
!=
nil
{
...
...
@@ -275,7 +275,7 @@ func (c *IniConfigContainer) String(key string) string {
}
// DefaultString returns the string value for a given key.
// if err != nil return defaltval
// if err != nil return defa
u
ltval
func
(
c
*
IniConfigContainer
)
DefaultString
(
key
string
,
defaultval
string
)
string
{
v
:=
c
.
String
(
key
)
if
v
==
""
{
...
...
@@ -295,7 +295,7 @@ func (c *IniConfigContainer) Strings(key string) []string {
}
// DefaultStrings returns the []string value for a given key.
// if err != nil return defaltval
// if err != nil return defa
u
ltval
func
(
c
*
IniConfigContainer
)
DefaultStrings
(
key
string
,
defaultval
[]
string
)
[]
string
{
v
:=
c
.
Strings
(
key
)
if
v
==
nil
{
...
...
@@ -314,7 +314,7 @@ func (c *IniConfigContainer) GetSection(section string) (map[string]string, erro
// SaveConfigFile save the config into file.
//
// BUG(env): The environment variable config item will be saved with real value in SaveConfigFile Func
a
tion.
// BUG(env): The environment variable config item will be saved with real value in SaveConfigFile Function.
func
(
c
*
IniConfigContainer
)
SaveConfigFile
(
filename
string
)
(
err
error
)
{
// Write configuration file by filename.
f
,
err
:=
os
.
Create
(
filename
)
...
...
config/json.go
View file @
88940813
...
...
@@ -101,7 +101,7 @@ func (c *JSONConfigContainer) Int(key string) (int, error) {
}
// DefaultInt returns the integer value for a given key.
// if err != nil return defaltval
// if err != nil return defa
u
ltval
func
(
c
*
JSONConfigContainer
)
DefaultInt
(
key
string
,
defaultval
int
)
int
{
if
v
,
err
:=
c
.
Int
(
key
);
err
==
nil
{
return
v
...
...
@@ -122,7 +122,7 @@ func (c *JSONConfigContainer) Int64(key string) (int64, error) {
}
// DefaultInt64 returns the int64 value for a given key.
// if err != nil return defaltval
// if err != nil return defa
u
ltval
func
(
c
*
JSONConfigContainer
)
DefaultInt64
(
key
string
,
defaultval
int64
)
int64
{
if
v
,
err
:=
c
.
Int64
(
key
);
err
==
nil
{
return
v
...
...
@@ -143,7 +143,7 @@ func (c *JSONConfigContainer) Float(key string) (float64, error) {
}
// DefaultFloat returns the float64 value for a given key.
// if err != nil return defaltval
// if err != nil return defa
u
ltval
func
(
c
*
JSONConfigContainer
)
DefaultFloat
(
key
string
,
defaultval
float64
)
float64
{
if
v
,
err
:=
c
.
Float
(
key
);
err
==
nil
{
return
v
...
...
@@ -163,7 +163,7 @@ func (c *JSONConfigContainer) String(key string) string {
}
// DefaultString returns the string value for a given key.
// if err != nil return defaltval
// if err != nil return defa
u
ltval
func
(
c
*
JSONConfigContainer
)
DefaultString
(
key
string
,
defaultval
string
)
string
{
// TODO FIXME should not use "" to replace non existence
if
v
:=
c
.
String
(
key
);
v
!=
""
{
...
...
@@ -182,7 +182,7 @@ func (c *JSONConfigContainer) Strings(key string) []string {
}
// DefaultStrings returns the []string value for a given key.
// if err != nil return defaltval
// if err != nil return defa
u
ltval
func
(
c
*
JSONConfigContainer
)
DefaultStrings
(
key
string
,
defaultval
[]
string
)
[]
string
{
if
v
:=
c
.
Strings
(
key
);
v
!=
nil
{
return
v
...
...
config/json_test.go
View file @
88940813
...
...
@@ -216,7 +216,7 @@ func TestJson(t *testing.T) {
t
.
Error
(
"unknown keys should return an error when expecting a Bool"
)
}
if
!
jsonconf
.
DefaultBool
(
"unknow"
,
true
)
{
if
!
jsonconf
.
DefaultBool
(
"unknow
n
"
,
true
)
{
t
.
Error
(
"unknown keys with default value wrong"
)
}
}
config/xml/xml.go
View file @
88940813
...
...
@@ -102,7 +102,7 @@ func (c *ConfigContainer) Int(key string) (int, error) {
}
// DefaultInt returns the integer value for a given key.
// if err != nil return defaltval
// if err != nil return defa
u
ltval
func
(
c
*
ConfigContainer
)
DefaultInt
(
key
string
,
defaultval
int
)
int
{
v
,
err
:=
c
.
Int
(
key
)
if
err
!=
nil
{
...
...
@@ -117,7 +117,7 @@ func (c *ConfigContainer) Int64(key string) (int64, error) {
}
// DefaultInt64 returns the int64 value for a given key.
// if err != nil return defaltval
// if err != nil return defa
u
ltval
func
(
c
*
ConfigContainer
)
DefaultInt64
(
key
string
,
defaultval
int64
)
int64
{
v
,
err
:=
c
.
Int64
(
key
)
if
err
!=
nil
{
...
...
@@ -133,7 +133,7 @@ func (c *ConfigContainer) Float(key string) (float64, error) {
}
// DefaultFloat returns the float64 value for a given key.
// if err != nil return defaltval
// if err != nil return defa
u
ltval
func
(
c
*
ConfigContainer
)
DefaultFloat
(
key
string
,
defaultval
float64
)
float64
{
v
,
err
:=
c
.
Float
(
key
)
if
err
!=
nil
{
...
...
@@ -151,7 +151,7 @@ func (c *ConfigContainer) String(key string) string {
}
// DefaultString returns the string value for a given key.
// if err != nil return defaltval
// if err != nil return defa
u
ltval
func
(
c
*
ConfigContainer
)
DefaultString
(
key
string
,
defaultval
string
)
string
{
v
:=
c
.
String
(
key
)
if
v
==
""
{
...
...
@@ -170,7 +170,7 @@ func (c *ConfigContainer) Strings(key string) []string {
}
// DefaultStrings returns the []string value for a given key.
// if err != nil return defaltval
// if err != nil return defa
u
ltval
func
(
c
*
ConfigContainer
)
DefaultStrings
(
key
string
,
defaultval
[]
string
)
[]
string
{
v
:=
c
.
Strings
(
key
)
if
v
==
nil
{
...
...
config/yaml/yaml.go
View file @
88940813
...
...
@@ -154,7 +154,7 @@ func (c *ConfigContainer) Int(key string) (int, error) {
}
// DefaultInt returns the integer value for a given key.
// if err != nil return defaltval
// if err != nil return defa
u
ltval
func
(
c
*
ConfigContainer
)
DefaultInt
(
key
string
,
defaultval
int
)
int
{
v
,
err
:=
c
.
Int
(
key
)
if
err
!=
nil
{
...
...
@@ -174,7 +174,7 @@ func (c *ConfigContainer) Int64(key string) (int64, error) {
}
// DefaultInt64 returns the int64 value for a given key.
// if err != nil return defaltval
// if err != nil return defa
u
ltval
func
(
c
*
ConfigContainer
)
DefaultInt64
(
key
string
,
defaultval
int64
)
int64
{
v
,
err
:=
c
.
Int64
(
key
)
if
err
!=
nil
{
...
...
@@ -198,7 +198,7 @@ func (c *ConfigContainer) Float(key string) (float64, error) {
}
// DefaultFloat returns the float64 value for a given key.
// if err != nil return defaltval
// if err != nil return defa
u
ltval
func
(
c
*
ConfigContainer
)
DefaultFloat
(
key
string
,
defaultval
float64
)
float64
{
v
,
err
:=
c
.
Float
(
key
)
if
err
!=
nil
{
...
...
@@ -218,7 +218,7 @@ func (c *ConfigContainer) String(key string) string {
}
// DefaultString returns the string value for a given key.
// if err != nil return defaltval
// if err != nil return defa
u
ltval
func
(
c
*
ConfigContainer
)
DefaultString
(
key
string
,
defaultval
string
)
string
{
v
:=
c
.
String
(
key
)
if
v
==
""
{
...
...
@@ -237,7 +237,7 @@ func (c *ConfigContainer) Strings(key string) []string {
}
// DefaultStrings returns the []string value for a given key.
// if err != nil return defaltval
// if err != nil return defa
u
ltval
func
(
c
*
ConfigContainer
)
DefaultStrings
(
key
string
,
defaultval
[]
string
)
[]
string
{
v
:=
c
.
Strings
(
key
)
if
v
==
nil
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment