mirror of
https://github.com/Luzifer/cloudkeys-go.git
synced 2024-09-19 15:42:58 +00:00
Replace stdout logging with proper log package
fixes #16 Signed-off-by: Knut Ahlers <knut@ahlers.me>
This commit is contained in:
parent
884dbd7b1b
commit
a0e5005835
9
ajax.go
9
ajax.go
@ -8,6 +8,7 @@ import (
|
|||||||
|
|
||||||
"github.com/flosch/pongo2"
|
"github.com/flosch/pongo2"
|
||||||
"github.com/gorilla/sessions"
|
"github.com/gorilla/sessions"
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
type ajaxResponse struct {
|
type ajaxResponse struct {
|
||||||
@ -33,7 +34,7 @@ func ajaxGetHandler(res http.ResponseWriter, r *http.Request, session *sessions.
|
|||||||
|
|
||||||
userFileRaw, err := storage.Read(user.UserFile)
|
userFileRaw, err := storage.Read(user.UserFile)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Printf("ERR: Unable to read user file: %s\n", err)
|
log.WithError(err).Error("Could not read user file from storage")
|
||||||
res.Write(ajaxResponse{Error: true}.Bytes())
|
res.Write(ajaxResponse{Error: true}.Bytes())
|
||||||
return nil, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
@ -60,7 +61,7 @@ func ajaxPostHandler(res http.ResponseWriter, r *http.Request, session *sessions
|
|||||||
|
|
||||||
userFileRaw, err := storage.Read(user.UserFile)
|
userFileRaw, err := storage.Read(user.UserFile)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Printf("ERR: Unable to read user file: %s\n", err)
|
log.WithError(err).Error("Could not read user file from storage")
|
||||||
res.Write(ajaxResponse{Error: true, Type: "storage_error"}.Bytes())
|
res.Write(ajaxResponse{Error: true, Type: "storage_error"}.Bytes())
|
||||||
return nil, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
@ -84,7 +85,7 @@ func ajaxPostHandler(res http.ResponseWriter, r *http.Request, session *sessions
|
|||||||
}
|
}
|
||||||
|
|
||||||
if err := storage.Backup(user.UserFile); err != nil {
|
if err := storage.Backup(user.UserFile); err != nil {
|
||||||
fmt.Printf("ERR: Unable to backup user file: %s\n", err)
|
log.WithError(err).Error("Could not create backup of user file")
|
||||||
res.Write(ajaxResponse{Error: true, Type: "storage_error"}.Bytes())
|
res.Write(ajaxResponse{Error: true, Type: "storage_error"}.Bytes())
|
||||||
return nil, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
@ -95,7 +96,7 @@ func ajaxPostHandler(res http.ResponseWriter, r *http.Request, session *sessions
|
|||||||
d, _ := userFile.GetData()
|
d, _ := userFile.GetData()
|
||||||
|
|
||||||
if err := storage.Write(user.UserFile, d); err != nil {
|
if err := storage.Write(user.UserFile, d); err != nil {
|
||||||
fmt.Printf("ERR: Unable to write user file: %s\n", err)
|
log.WithError(err).Error("Could not write user file to storage")
|
||||||
res.Write(ajaxResponse{Error: true, Type: "storage_error"}.Bytes())
|
res.Write(ajaxResponse{Error: true, Type: "storage_error"}.Bytes())
|
||||||
return nil, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"github.com/flosch/pongo2"
|
"github.com/flosch/pongo2"
|
||||||
"github.com/gorilla/sessions"
|
"github.com/gorilla/sessions"
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
type httpHelperFunc func(res http.ResponseWriter, r *http.Request, session *sessions.Session, ctx *pongo2.Context) (*string, error)
|
type httpHelperFunc func(res http.ResponseWriter, r *http.Request, session *sessions.Session, ctx *pongo2.Context) (*string, error)
|
||||||
@ -22,7 +22,7 @@ func httpHelper(f httpHelperFunc) http.HandlerFunc {
|
|||||||
template, err := f(res, r, sess, &ctx)
|
template, err := f(res, r, sess, &ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
http.Error(res, "An error ocurred.", http.StatusInternalServerError)
|
http.Error(res, "An error ocurred.", http.StatusInternalServerError)
|
||||||
fmt.Printf("ERR: %s\n", err)
|
log.WithError(err).Error("Unable to execute template")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -31,13 +31,17 @@ func httpHelper(f httpHelperFunc) http.HandlerFunc {
|
|||||||
ts.SetBaseDirectory("templates")
|
ts.SetBaseDirectory("templates")
|
||||||
tpl, err := ts.FromFile(*template)
|
tpl, err := ts.FromFile(*template)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Printf("ERR: Could not parse template '%s': %s\n", *template, err)
|
log.WithError(err).WithFields(log.Fields{
|
||||||
|
"template": *template,
|
||||||
|
}).Error("Could not parse template")
|
||||||
http.Error(res, "An error ocurred.", http.StatusInternalServerError)
|
http.Error(res, "An error ocurred.", http.StatusInternalServerError)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
out, err := tpl.Execute(ctx)
|
out, err := tpl.Execute(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Printf("ERR: Unable to execute template '%s': %s\n", *template, err)
|
log.WithError(err).WithFields(log.Fields{
|
||||||
|
"template": *template,
|
||||||
|
}).Error("Could not execute template")
|
||||||
http.Error(res, "An error ocurred.", http.StatusInternalServerError)
|
http.Error(res, "An error ocurred.", http.StatusInternalServerError)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
3
login.go
3
login.go
@ -12,6 +12,7 @@ import (
|
|||||||
"github.com/flosch/pongo2"
|
"github.com/flosch/pongo2"
|
||||||
"github.com/gorilla/mux"
|
"github.com/gorilla/mux"
|
||||||
"github.com/gorilla/sessions"
|
"github.com/gorilla/sessions"
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
func loginHandler(res http.ResponseWriter, r *http.Request, session *sessions.Session, ctx *pongo2.Context) (*string, error) {
|
func loginHandler(res http.ResponseWriter, r *http.Request, session *sessions.Session, ctx *pongo2.Context) (*string, error) {
|
||||||
@ -28,7 +29,7 @@ func loginHandler(res http.ResponseWriter, r *http.Request, session *sessions.Se
|
|||||||
|
|
||||||
userFileRaw, err := storage.Read(createUserFilename(username))
|
userFileRaw, err := storage.Read(createUserFilename(username))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Printf("ERR: Unable to read user file: %s\n", err)
|
log.WithError(err).Error("Unable to read user file")
|
||||||
(*ctx)["error"] = true
|
(*ctx)["error"] = true
|
||||||
return stringPointer("login.html"), nil
|
return stringPointer("login.html"), nil
|
||||||
}
|
}
|
||||||
|
10
main.go
10
main.go
@ -13,6 +13,7 @@ import (
|
|||||||
"github.com/gorilla/mux"
|
"github.com/gorilla/mux"
|
||||||
"github.com/gorilla/sessions"
|
"github.com/gorilla/sessions"
|
||||||
"github.com/satori/go.uuid"
|
"github.com/satori/go.uuid"
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@ -30,18 +31,18 @@ func init() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if _, err := cfg.ParsedStorage(); err != nil {
|
if _, err := cfg.ParsedStorage(); err != nil {
|
||||||
fmt.Printf("ERR: Please provide a valid storage URI\n")
|
log.WithError(err).Error("Unable to parse storage URI")
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
if cfg.CookieSigningKey == "" {
|
if cfg.CookieSigningKey == "" {
|
||||||
cfg.CookieSigningKey = uuid.NewV4().String()[:32]
|
cfg.CookieSigningKey = uuid.NewV4().String()[:32]
|
||||||
fmt.Printf("WRN: cookie-authkey was set randomly, this will break your sessions!\n")
|
log.Warn("cookie-authkey was set randomly, this will break your sessions!")
|
||||||
}
|
}
|
||||||
|
|
||||||
if cfg.CookieEncryptKey == "" {
|
if cfg.CookieEncryptKey == "" {
|
||||||
cfg.CookieEncryptKey = uuid.NewV4().String()[:32]
|
cfg.CookieEncryptKey = uuid.NewV4().String()[:32]
|
||||||
fmt.Printf("WRN: cookie-encryptkey was set randomly, this will break your sessions!\n")
|
log.Warn("cookie-encryptkey was set randomly, this will break your sessions!")
|
||||||
}
|
}
|
||||||
|
|
||||||
cookieStore = sessions.NewCookieStore(
|
cookieStore = sessions.NewCookieStore(
|
||||||
@ -53,8 +54,7 @@ func init() {
|
|||||||
func main() {
|
func main() {
|
||||||
s, err := getStorageAdapter(cfg)
|
s, err := getStorageAdapter(cfg)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Printf("ERR: Could not instanciate storage: %s\n", err)
|
log.WithError(err).Fatal("Could not instanciate storage")
|
||||||
os.Exit(1)
|
|
||||||
}
|
}
|
||||||
storage = s
|
storage = s
|
||||||
|
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
@ -9,6 +8,7 @@ import (
|
|||||||
|
|
||||||
"github.com/flosch/pongo2"
|
"github.com/flosch/pongo2"
|
||||||
"github.com/gorilla/sessions"
|
"github.com/gorilla/sessions"
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
func registerHandler(res http.ResponseWriter, r *http.Request, session *sessions.Session, ctx *pongo2.Context) (*string, error) {
|
func registerHandler(res http.ResponseWriter, r *http.Request, session *sessions.Session, ctx *pongo2.Context) (*string, error) {
|
||||||
@ -29,7 +29,7 @@ func registerHandler(res http.ResponseWriter, r *http.Request, session *sessions
|
|||||||
|
|
||||||
hashedPassword, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
|
hashedPassword, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Printf("ERR: Unable to hash users password: %s\n", err)
|
log.WithError(err).Error("Could not hash user password")
|
||||||
(*ctx)["error"] = true
|
(*ctx)["error"] = true
|
||||||
return stringPointer("register.html"), nil
|
return stringPointer("register.html"), nil
|
||||||
}
|
}
|
||||||
@ -39,7 +39,7 @@ func registerHandler(res http.ResponseWriter, r *http.Request, session *sessions
|
|||||||
data, _ := d.GetData()
|
data, _ := d.GetData()
|
||||||
|
|
||||||
if err := storage.Write(createUserFilename(username), data); err != nil {
|
if err := storage.Write(createUserFilename(username), data); err != nil {
|
||||||
fmt.Printf("ERR: Unable to write user file: %s\n", err)
|
log.WithError(err).Error("Could not write user file to storage")
|
||||||
(*ctx)["error"] = true
|
(*ctx)["error"] = true
|
||||||
return stringPointer("register.html"), nil
|
return stringPointer("register.html"), nil
|
||||||
}
|
}
|
||||||
|
@ -2,7 +2,6 @@ package main
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"fmt"
|
|
||||||
"io"
|
"io"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"net/url"
|
"net/url"
|
||||||
@ -10,6 +9,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
"github.com/xuyu/goredis"
|
"github.com/xuyu/goredis"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -57,7 +57,10 @@ func (r *RedisStorage) Read(identifier string) (io.Reader, error) {
|
|||||||
func (r *RedisStorage) IsPresent(identifier string) bool {
|
func (r *RedisStorage) IsPresent(identifier string) bool {
|
||||||
e, err := r.conn.Exists(r.prefix + identifier)
|
e, err := r.conn.Exists(r.prefix + identifier)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Printf("ERR: %s\n", err)
|
log.WithError(err).WithFields(log.Fields{
|
||||||
|
"storagedriver": "redis",
|
||||||
|
"identifier": identifier,
|
||||||
|
}).Error("Unable to check key existence")
|
||||||
}
|
}
|
||||||
return e && err == nil
|
return e && err == nil
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user