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
5c1e8e42
Commit
5c1e8e42
authored
Oct 09, 2014
by
Bill Davis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reworked implementation to not return encoded json
parent
ca3e7568
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
9 deletions
+7
-9
statistics.go
toolbox/statistics.go
+2
-7
statistics_test.go
toolbox/statistics_test.go
+5
-2
No files found.
toolbox/statistics.go
View file @
5c1e8e42
...
...
@@ -15,7 +15,6 @@
package
toolbox
import
(
"encoding/json"
"fmt"
"sync"
"time"
...
...
@@ -112,11 +111,7 @@ func (m *UrlMap) GetMap() map[string]interface{} {
return
content
}
func
(
m
*
UrlMap
)
GetMapJSON
()
([]
byte
,
error
)
{
return
json
.
Marshal
(
m
)
}
func
(
m
UrlMap
)
MarshalJSON
()
([]
byte
,
error
)
{
func
(
m
*
UrlMap
)
GetMapData
()
[]
map
[
string
]
interface
{}
{
resultLists
:=
make
([]
map
[
string
]
interface
{},
0
)
...
...
@@ -134,7 +129,7 @@ func (m UrlMap) MarshalJSON() ([]byte, error) {
resultLists
=
append
(
resultLists
,
result
)
}
}
return
json
.
Marshal
(
resultLists
)
return
resultLists
}
// global statistics data map
...
...
toolbox/statistics_test.go
View file @
5c1e8e42
...
...
@@ -15,6 +15,7 @@
package
toolbox
import
(
"encoding/json"
"testing"
"time"
)
...
...
@@ -29,9 +30,11 @@ func TestStatics(t *testing.T) {
StatisticsMap
.
AddStatistics
(
"DELETE"
,
"/api/user"
,
"&admin.user"
,
time
.
Duration
(
1400
))
t
.
Log
(
StatisticsMap
.
GetMap
())
jsonString
,
err
:=
StatisticsMap
.
GetMapJSON
()
data
:=
StatisticsMap
.
GetMapData
()
b
,
err
:=
json
.
Marshal
(
data
)
if
err
!=
nil
{
t
.
Errorf
(
err
.
Error
())
}
t
.
Log
(
string
(
jsonString
))
t
.
Log
(
string
(
b
))
}
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