Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
enoch
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DevOps
enoch
Commits
4e5c2fd4
Commit
4e5c2fd4
authored
Dec 23, 2019
by
jingbo.wang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
只关注指定服务
parent
87d85f7e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
6 deletions
+19
-6
regular_email.go
pkg/report-form/regular_email.go
+1
-3
regular_report.go
pkg/report-form/regular_report.go
+16
-1
service_map.go
pkg/report-form/service_map.go
+2
-2
No files found.
pkg/report-form/regular_email.go
View file @
4e5c2fd4
...
...
@@ -58,11 +58,9 @@ func RegularMail(dir string) {
timer
.
Stop
()
//发送邮件
//周
if
next
.
Weekday
()
==
time
.
Monday
{
callSendEmailApi
(
"week"
,
next
,
"all"
,
receiverList
)
for
name
,
emailList
:=
range
serviceOwner
{
callSendEmailApi
(
"week"
,
next
,
name
,
emailList
)
}
}
}
}()
...
...
pkg/report-form/regular_report.go
View file @
4e5c2fd4
package
report_form
import
(
"encoding/json"
"git.quantgroup.cn/DevOps/enoch/pkg/global"
"git.quantgroup.cn/DevOps/enoch/pkg/glog"
"github.com/vrg0/go-common/util"
"io/ioutil"
...
...
@@ -68,6 +70,19 @@ func run(now time.Time, dir string) {
}
}
var
serviceList
[]
string
=
nil
func
init
()
{
global
.
Config
.
Watch
(
global
.
NamespaceApplication
,
"service.list"
,
func
(
oldCfg
string
,
newCfg
string
)
{
newList
:=
make
([]
string
,
0
)
if
err
:=
json
.
Unmarshal
([]
byte
(
newCfg
),
&
newList
);
err
!=
nil
{
glog
.
Error
(
"service.list can not unmarshal json:"
,
err
)
return
}
serviceList
=
newList
})
}
func
reportForm
(
t
time
.
Time
,
dir
string
,
n
int
)
{
startTime
:=
t
.
Add
(
-
1
*
time
.
Duration
(
t
.
Hour
())
*
time
.
Hour
)
startTime
=
startTime
.
Add
(
-
1
*
time
.
Duration
(
t
.
Minute
())
*
time
.
Minute
)
...
...
@@ -77,7 +92,7 @@ func reportForm(t time.Time, dir string, n int) {
endTime
:=
startTime
.
AddDate
(
0
,
0
,
n
)
glog
.
Info
(
"报表开始:"
,
startTime
.
Format
(
timeFormat
),
" ~ "
,
endTime
.
Format
(
timeFormat
))
sm
:=
NewServiceMap
(
startTime
,
endTime
)
sm
:=
NewServiceMap
(
startTime
,
endTime
,
serviceList
)
long
:=
"day"
if
n
==
7
{
...
...
pkg/report-form/service_map.go
View file @
4e5c2fd4
...
...
@@ -12,7 +12,7 @@ type ServiceMap struct {
serviceMap
map
[
string
]
*
Service
}
func
NewServiceMap
(
startTime
time
.
Time
,
endTime
time
.
Time
)
*
ServiceMap
{
func
NewServiceMap
(
startTime
time
.
Time
,
endTime
time
.
Time
,
serviceList
[]
string
)
*
ServiceMap
{
rtn
:=
&
ServiceMap
{
startTime
:
startTime
,
endTime
:
endTime
,
...
...
@@ -20,7 +20,7 @@ func NewServiceMap(startTime time.Time, endTime time.Time) *ServiceMap {
}
//初始化service
serviceList
:=
rtn
.
getServiceList
()
//
serviceList := rtn.getServiceList()
for
_
,
serviceName
:=
range
serviceList
{
glog
.
Info
(
"init service :"
,
serviceName
,
" start"
)
rtn
.
serviceMap
[
serviceName
]
=
NewService
(
serviceName
,
startTime
,
endTime
)
...
...
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