enhance error handling
This commit is contained in:
parent
b3e93f8478
commit
8929a2f919
17
metrics.go
17
metrics.go
|
|
@ -31,6 +31,16 @@ type OneMetric struct {
|
||||||
|
|
||||||
// metrics handler
|
// metrics handler
|
||||||
|
|
||||||
|
func validProperty(prop string) bool {
|
||||||
|
valid_properties := [...]string{"w", "t", "h", "p", "vp" }
|
||||||
|
for _, p := range valid_properties {
|
||||||
|
if p == prop {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
func metricsHandler(response http.ResponseWriter, request *http.Request) {
|
func metricsHandler(response http.ResponseWriter, request *http.Request) {
|
||||||
name := getUserName(request)
|
name := getUserName(request)
|
||||||
if name != "" {
|
if name != "" {
|
||||||
|
|
@ -42,6 +52,13 @@ func metricsHandler(response http.ResponseWriter, request *http.Request) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!validProperty(property[0])) {
|
||||||
|
log.Println("Url Param 'property' is invalid")
|
||||||
|
fmt.Fprintf(response, "{ \"msg\": \"error: invalid property\" }")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
deveui, ok := request.URL.Query()["deveui"]
|
deveui, ok := request.URL.Query()["deveui"]
|
||||||
|
|
||||||
if !ok || len(deveui[0]) < 1 {
|
if !ok || len(deveui[0]) < 1 {
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
<link href="static/bulma-calendar/css/bulma-calendar.min.css" rel="stylesheet">
|
<link href="static/bulma-calendar/css/bulma-calendar.min.css" rel="stylesheet">
|
||||||
<script src="static/bulma-calendar/js/bulma-calendar.min.js"></script>
|
<script src="static/bulma-calendar/js/bulma-calendar.min.js"></script>
|
||||||
|
|
||||||
<div class="columns">
|
<div class="columns" id="myselectors">
|
||||||
<div class="column is-half">
|
<div class="column is-half">
|
||||||
<div id="reportrange" style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
|
<div id="reportrange" style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
|
||||||
<i class="fa fa-calendar"></i>
|
<i class="fa fa-calendar"></i>
|
||||||
|
|
@ -214,6 +214,7 @@ function drawGraph(deveui, alias, property, start, stop, create_graph) {
|
||||||
</div>
|
</div>
|
||||||
</article>`);
|
</article>`);
|
||||||
} else if (mydata.msg.includes("error:")) {
|
} else if (mydata.msg.includes("error:")) {
|
||||||
|
$('#myselectors').hide();
|
||||||
$('#chart').html(`<article class="message is-danger">
|
$('#chart').html(`<article class="message is-danger">
|
||||||
<div class="message-body">
|
<div class="message-body">
|
||||||
Fehler im Aufruf
|
Fehler im Aufruf
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue