Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
879aed7d
Unverified
Commit
879aed7d
authored
Nov 21, 2018
by
Marcus Efraimsson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cloudwatch: recover/handle panics when executing queries
parent
4bd8b2c1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
0 deletions
+23
-0
pkg/tsdb/cloudwatch/cloudwatch.go
+23
-0
No files found.
pkg/tsdb/cloudwatch/cloudwatch.go
View file @
879aed7d
...
...
@@ -126,6 +126,18 @@ func (e *CloudWatchExecutor) executeTimeSeriesQuery(ctx context.Context, queryCo
}
eg
.
Go
(
func
()
error
{
defer
func
()
{
if
err
:=
recover
();
err
!=
nil
{
plog
.
Error
(
"Execute Query Panic"
,
"error"
,
err
,
"stack"
,
log
.
Stack
(
1
))
if
theErr
,
ok
:=
err
.
(
error
);
ok
{
resultChan
<-
&
tsdb
.
QueryResult
{
RefId
:
query
.
RefId
,
Error
:
theErr
,
}
}
}
}()
queryRes
,
err
:=
e
.
executeQuery
(
ectx
,
query
,
queryContext
)
if
ae
,
ok
:=
err
.
(
awserr
.
Error
);
ok
&&
ae
.
Code
()
==
"500"
{
return
err
...
...
@@ -146,6 +158,17 @@ func (e *CloudWatchExecutor) executeTimeSeriesQuery(ctx context.Context, queryCo
for
region
,
getMetricDataQuery
:=
range
getMetricDataQueries
{
q
:=
getMetricDataQuery
eg
.
Go
(
func
()
error
{
defer
func
()
{
if
err
:=
recover
();
err
!=
nil
{
plog
.
Error
(
"Execute Get Metric Data Query Panic"
,
"error"
,
err
,
"stack"
,
log
.
Stack
(
1
))
if
theErr
,
ok
:=
err
.
(
error
);
ok
{
resultChan
<-
&
tsdb
.
QueryResult
{
Error
:
theErr
,
}
}
}
}()
queryResponses
,
err
:=
e
.
executeGetMetricDataQuery
(
ectx
,
region
,
q
,
queryContext
)
if
ae
,
ok
:=
err
.
(
awserr
.
Error
);
ok
&&
ae
.
Code
()
==
"500"
{
return
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