github
/
statping
mirror of https://github.com/statping/statping
1
0
Fork 0
Code Issues Releases Wiki Activity

JS updates

pull/116/head
Hunter Long 2018-12-05 12:31:20 -08:00
parent 3c2bd33aad
commit cdcfa2f481
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
handlers/routes.go
View File

@ -35,7 +35,7 @@ func Router() *mux.Router {
dir := utils.Directory dir := utils.Directory
CacheStorage = NewStorage() CacheStorage = NewStorage()
r := mux.NewRouter() r := mux.NewRouter()
r.Handle("/", cached("120s", "text/html", http.HandlerFunc(indexHandler))) r.Handle("/", cached("15s", "text/html", http.HandlerFunc(indexHandler)))
if source.UsingAssets(dir) { if source.UsingAssets(dir) {
indexHandler := http.FileServer(http.Dir(dir + "/assets/")) indexHandler := http.FileServer(http.Dir(dir + "/assets/"))
r.PathPrefix("/css/").Handler(http.StripPrefix("/css/", http.FileServer(http.Dir(dir+"/assets/css")))) r.PathPrefix("/css/").Handler(http.StripPrefix("/css/", http.FileServer(http.Dir(dir+"/assets/css"))))
@ -94,7 +94,7 @@ func Router() *mux.Router {
r.Handle("/api/services", http.HandlerFunc(apiCreateServiceHandler)).Methods("POST") r.Handle("/api/services", http.HandlerFunc(apiCreateServiceHandler)).Methods("POST")
r.Handle("/api/services/{id}", http.HandlerFunc(apiServiceHandler)).Methods("GET") r.Handle("/api/services/{id}", http.HandlerFunc(apiServiceHandler)).Methods("GET")
r.Handle("/api/services/reorder", http.HandlerFunc(reorderServiceHandler)).Methods("POST") r.Handle("/api/services/reorder", http.HandlerFunc(reorderServiceHandler)).Methods("POST")
r.Handle("/api/services/{id}/data", cached("120s", "application/json", http.HandlerFunc(apiServiceDataHandler))).Methods("GET") r.Handle("/api/services/{id}/data", cached("30s", "application/json", http.HandlerFunc(apiServiceDataHandler))).Methods("GET")
r.Handle("/api/services/{id}/ping", http.HandlerFunc(apiServicePingDataHandler)).Methods("GET") r.Handle("/api/services/{id}/ping", http.HandlerFunc(apiServicePingDataHandler)).Methods("GET")
r.Handle("/api/services/{id}", http.HandlerFunc(apiServiceUpdateHandler)).Methods("POST") r.Handle("/api/services/{id}", http.HandlerFunc(apiServiceUpdateHandler)).Methods("POST")
r.Handle("/api/services/{id}", http.HandlerFunc(apiServiceDeleteHandler)).Methods("DELETE") r.Handle("/api/services/{id}", http.HandlerFunc(apiServiceDeleteHandler)).Methods("DELETE")

2
source/js/main.js
View File

@ -109,7 +109,7 @@ function AjaxChart(chart, service, start=0, end=9999999999, group="hour") {
url: "/api/services/"+service+"/data?start="+start+"&end="+end+"&group="+group, url: "/api/services/"+service+"/data?start="+start+"&end="+end+"&group="+group,
type: 'GET', type: 'GET',
success: function(data) { success: function(data) {
if (data.data.length <= 3) { if (data.data.length < 12) {
AjaxChart(chart, service, 0, 9999999999, "second") AjaxChart(chart, service, 0, 9999999999, "second")
return; return;
} else if (data.data.length === 0) { } else if (data.data.length === 0) {

12
utils/utils.go
View File

@ -203,9 +203,9 @@ func copyAndCapture(w io.Writer, r io.Reader) ([]byte, error) {
} }
// DurationReadable will return a time.Duration into a human readable string // DurationReadable will return a time.Duration into a human readable string
// t := time.Duration(5 * time.Minute) // // t := time.Duration(5 * time.Minute)
// DurationReadable(t) // // DurationReadable(t)
// // 5 minutes // // returns: 5 minutes
func DurationReadable(d time.Duration) string { func DurationReadable(d time.Duration) string {
if d.Hours() >= 1 { if d.Hours() >= 1 {
return fmt.Sprintf("%0.0f hours", d.Hours()) return fmt.Sprintf("%0.0f hours", d.Hours())
@ -225,6 +225,12 @@ func SaveFile(filename string, data []byte) error {
} }
// HttpRequest is a global function to send a HTTP request // HttpRequest is a global function to send a HTTP request
// // url - The URL for HTTP request
// // method - GET, POST, DELETE, PATCH
// // content - The HTTP request content type (text/plain, application/json, or nil)
// // headers - An array of Headers to be sent (KEY=VALUE) []string{"Authentication=12345", ...}
// // body - The body or form data to send with HTTP request
// // timeout - Specific duration to timeout on. time.Duration(30 * time.Seconds)
func HttpRequest(url, method string, content interface{}, headers []string, body io.Reader, timeout time.Duration) ([]byte, *http.Response, error) { func HttpRequest(url, method string, content interface{}, headers []string, body io.Reader, timeout time.Duration) ([]byte, *http.Response, error) {
var err error var err error
transport := &http.Transport{ transport := &http.Transport{