JSON fixes - timestamp fixes

Makefile

@@ -1,4 +1,4 @@
-VERSION=0.79
+VERSION=0.79.1
 BINARY_NAME=statup
 GOPATH:=$(GOPATH)
 GOCMD=go

core/hits.go

@@ -27,7 +27,9 @@ type Hit struct {
 
 // CreateHit will create a new 'hit' record in the database for a successful/online service
 func (s *Service) CreateHit(h *types.Hit) (int64, error) {
-	h.CreatedAt = time.Now().UTC()
+	if h.CreatedAt.IsZero() {
+		h.CreatedAt = time.Now().UTC()
+	}
 	db := hitsDB().Create(&h)
 	if db.Error != nil {
 		utils.Log(2, db.Error)

handlers/api.go

@@ -342,6 +342,8 @@ func apiNotifierGetHandler(w http.ResponseWriter, r *http.Request) {
 	}
 	fmt.Println(notify)
 	fmt.Println(notifierObj)
+	w.Header().Set("Content-Type", "application/json")
+	json.NewEncoder(w).Encode(notify)
 }
 
 func isAPIAuthorized(r *http.Request) bool {

handlers/cache.go

@@ -1,16 +1,18 @@
 package handlers
 
 import (
+	"github.com/hunterlong/statup/core"
 	"net/http"
 	"net/http/httptest"
 	"sync"
 	"time"
 )
 
-var storage Cacher
+var CacheStorage Cacher
 
 type Cacher interface {
 	Get(key string) []byte
+	Delete(key string)
 	Set(key string, content []byte, duration time.Duration)
 }
 
@@ -34,7 +36,7 @@ type Storage struct {
 	mu    *sync.RWMutex
 }
 
-//NewStorage creates a new in memory storage
+//NewStorage creates a new in memory CacheStorage
 func NewStorage() *Storage {
 	return &Storage{
 		items: make(map[string]Item),
@@ -55,6 +57,12 @@ func (s Storage) Get(key string) []byte {
 	return item.Content
 }
 
+func (s Storage) Delete(key string) {
+	s.mu.RLock()
+	defer s.mu.RUnlock()
+	delete(s.items, key)
+}
+
 //Set a cached content by key
 func (s Storage) Set(key string, content []byte, duration time.Duration) {
 	s.mu.Lock()
@@ -67,17 +75,20 @@ func (s Storage) Set(key string, content []byte, duration time.Duration) {
 
 func cached(duration, contentType string, handler func(w http.ResponseWriter, r *http.Request)) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		content := storage.Get(r.RequestURI)
+		content := CacheStorage.Get(r.RequestURI)
+		w.Header().Set("Content-Type", contentType)
+		if core.Configs == nil {
+			handler(w, r)
+			return
+		}
 		if content != nil {
-			w.Header().Set("Content-Type", contentType)
 			w.Write(content)
 		} else {
 			c := httptest.NewRecorder()
 			handler(c, r)
-			w.Header().Set("Content-Type", contentType)
 			content := c.Body.Bytes()
 			if d, err := time.ParseDuration(duration); err == nil {
-				storage.Set(r.RequestURI, content, d)
+				CacheStorage.Set(r.RequestURI, content, d)
 			}
 			w.Write(content)
 		}

handlers/routes.go

@@ -33,9 +33,9 @@ var (
 // Router returns all of the routes used in Statup
 func Router() *mux.Router {
 	dir := utils.Directory
-	storage = NewStorage()
+	CacheStorage = NewStorage()
 	r := mux.NewRouter()
-	r.Handle("/", http.HandlerFunc(indexHandler))
+	r.Handle("/", cached("120s", "text/html", http.HandlerFunc(indexHandler)))
 	if source.UsingAssets(dir) {
 		indexHandler := http.FileServer(http.Dir(dir + "/assets/"))
 		r.PathPrefix("/css/").Handler(http.StripPrefix("/font/", http.FileServer(http.Dir(dir+"/assets/font"))))
@@ -93,6 +93,10 @@ func Router() *mux.Router {
 	r.Handle("/checkin/{id}/delete", http.HandlerFunc(checkinDeleteHandler)).Methods("GET")
 	r.Handle("/checkin/{id}", http.HandlerFunc(checkinHitHandler))
 
+	// API Routes
+	r.Handle("/api", http.HandlerFunc(apiIndexHandler))
+	r.Handle("/api/renew", http.HandlerFunc(apiRenewHandler))
+
 	// API SERVICE Routes
 	r.Handle("/api/services", http.HandlerFunc(apiAllServicesHandler)).Methods("GET")
 	r.Handle("/api/services", http.HandlerFunc(apiCreateServiceHandler)).Methods("POST")
@@ -101,6 +105,7 @@ func Router() *mux.Router {
 	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(apiServiceDeleteHandler)).Methods("DELETE")
+	r.Handle("/api/checkin/{api}", http.HandlerFunc(apiCheckinHandler))
 
 	// API USER Routes
 	r.Handle("/api/users", http.HandlerFunc(apiAllUsersHandler)).Methods("GET")
@@ -113,10 +118,6 @@ func Router() *mux.Router {
 	r.Handle("/api/notifier/{notifier}", http.HandlerFunc(apiNotifierGetHandler)).Methods("GET")
 	r.Handle("/api/notifier/{notifier}", http.HandlerFunc(apiNotifierGetHandler)).Methods("POST")
 
-	// Generic API Routes
-	r.Handle("/api", http.HandlerFunc(apiIndexHandler))
-	r.Handle("/api/renew", http.HandlerFunc(apiRenewHandler))
-	r.Handle("/api/checkin/{api}", http.HandlerFunc(apiCheckinHandler))
 	r.Handle("/metrics", http.HandlerFunc(prometheusHandler))
 	r.Handle("/tray", http.HandlerFunc(trayHandler))
 	r.NotFoundHandler = http.HandlerFunc(error404Handler)

handlers/setup.go

@@ -119,6 +119,7 @@ func processSetupHandler(w http.ResponseWriter, r *http.Request) {
 
 	core.SampleData()
 	core.InitApp()
+	CacheStorage.Delete("/")
 	resetCookies()
 	time.Sleep(2 * time.Second)
 	http.Redirect(w, r, "/", http.StatusSeeOther)

source/tmpl/settings.html

@@ -109,6 +109,8 @@
                                     <input type="text" class="form-control select-input" value="{{ .ApiSecret }}" id="api_secret" readonly>
                                     <small class="form-text text-muted">You can <a href="/api/renew">Regenerate API Keys</a> if you need to.</small>
                                 </div>
+
+                                <img width="300" height="300" src="https://chart.googleapis.com/chart?chs=500x500&cht=qr&chl=http://statup://setup?domain={{ .Domain }}&api={{ .ApiKey }}&secret={{ .ApiSecret }}&choe=UTF-8">
                             </div>
 
                             <div class="row">