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
b08ace75
Commit
b08ace75
authored
Apr 19, 2017
by
astaxie
Committed by
GitHub
Apr 19, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2577 from ggicci/develop
Fix ini parsing error for multiple users on one machine.
parents
405c170d
d1a25839
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
3 deletions
+11
-3
ini.go
config/ini.go
+11
-3
No files found.
config/ini.go
View file @
b08ace75
...
...
@@ -21,6 +21,7 @@ import (
"io"
"io/ioutil"
"os"
"os/user"
"path/filepath"
"strconv"
"strings"
...
...
@@ -184,10 +185,17 @@ func (ini *IniConfig) parseData(dir string, data []byte) (*IniConfigContainer, e
// ParseData parse ini the data
// When include other.conf,other.conf is either absolute directory
// or under beego in default temporary directory(/tmp/beego).
// or under beego in default temporary directory(/tmp/beego
[-username]
).
func
(
ini
*
IniConfig
)
ParseData
(
data
[]
byte
)
(
Configer
,
error
)
{
dir
:=
filepath
.
Join
(
os
.
TempDir
(),
"beego"
)
os
.
MkdirAll
(
dir
,
os
.
ModePerm
)
dir
:=
"beego"
currentUser
,
err
:=
user
.
Current
()
if
err
==
nil
{
dir
=
"beego-"
+
currentUser
.
Username
}
dir
=
filepath
.
Join
(
os
.
TempDir
(),
dir
)
if
err
=
os
.
MkdirAll
(
dir
,
os
.
ModePerm
);
err
!=
nil
{
return
nil
,
err
}
return
ini
.
parseData
(
dir
,
data
)
}
...
...
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