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
e281b6e8
Commit
e281b6e8
authored
Mar 30, 2016
by
youngsterxyf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
improve
parent
561e7115
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
8 deletions
+11
-8
config.go
config.go
+11
-8
No files found.
config.go
View file @
e281b6e8
...
...
@@ -106,8 +106,6 @@ var (
AppConfig
*
beegoAppConfig
// AppPath is the absolute path to the app
AppPath
string
// workPath is the absolute path of the current dir
workPath
string
// GlobalSessions is the instance for the session manager
GlobalSessions
*
session
.
Manager
...
...
@@ -118,11 +116,6 @@ var (
)
func
init
()
{
AppPath
,
_
=
filepath
.
Abs
(
filepath
.
Dir
(
os
.
Args
[
0
]))
workPath
,
_
=
os
.
Getwd
()
workPath
,
_
=
filepath
.
Abs
(
workPath
)
BConfig
=
&
Config
{
AppName
:
"beego"
,
RunMode
:
DEV
,
...
...
@@ -183,6 +176,16 @@ func init() {
},
}
var
err
error
if
AppPath
,
err
=
filepath
.
Abs
(
filepath
.
Dir
(
os
.
Args
[
0
]));
err
!=
nil
{
panic
(
err
)
}
workPath
,
err
:=
os
.
Getwd
()
if
err
!=
nil
{
panic
(
err
)
}
appConfigPath
=
filepath
.
Join
(
workPath
,
"conf"
,
"app.conf"
)
if
!
utils
.
FileExists
(
appConfigPath
)
{
appConfigPath
=
filepath
.
Join
(
AppPath
,
"conf"
,
"app.conf"
)
...
...
@@ -192,7 +195,7 @@ func init() {
}
}
if
err
:
=
parseConfig
(
appConfigPath
);
err
!=
nil
{
if
err
=
parseConfig
(
appConfigPath
);
err
!=
nil
{
panic
(
err
)
}
}
...
...
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