archives/trantor
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add spaces to log messages

Browse source
This commit is contained in:
Las Zenow 2014-02-11 13:13:43 +01:00
parent 12b787e31f
commit f3ef9b6675
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cover.go
View file

@ -49,7 +49,7 @@ func coverHandler(h handler) {
f, err = fs.OpenId(book.Cover) f, err = fs.OpenId(book.Cover)
} }
if err != nil { if err != nil {
log.Error("Error while opening image:", err) log.Error("Error while opening image: ", err)
notFound(h) notFound(h)
return return
} }
@ -145,14 +145,14 @@ func storeImg(img io.Reader, title string, db *DB) (bson.ObjectId, bson.ObjectId
/* open the files */ /* open the files */
fBig, err := createCoverFile(title, db) fBig, err := createCoverFile(title, db)
if err != nil { if err != nil {
log.Error("Error creating", title, ":", err.Error()) log.Error("Error creating ", title, ": ", err.Error())
return "", "" return "", ""
} }
defer fBig.Close() defer fBig.Close()
fSmall, err := createCoverFile(title+"_small", db) fSmall, err := createCoverFile(title+"_small", db)
if err != nil { if err != nil {
log.Error("Error creating", title+"_small", ":", err.Error()) log.Error("Error creating ", title+"_small", ": ", err.Error())
return "", "" return "", ""
} }
defer fSmall.Close() defer fSmall.Close()
@ -163,22 +163,22 @@ func storeImg(img io.Reader, title string, db *DB) (bson.ObjectId, bson.ObjectId
jpgOptions := jpeg.Options{IMG_QUALITY} jpgOptions := jpeg.Options{IMG_QUALITY}
imgResized, err := resizeImg(img1, IMG_WIDTH_BIG) imgResized, err := resizeImg(img1, IMG_WIDTH_BIG)
if err != nil { if err != nil {
log.Error("Error resizing big image:", err.Error()) log.Error("Error resizing big image: ", err.Error())
return "", "" return "", ""
} }
err = jpeg.Encode(fBig, imgResized, &jpgOptions) err = jpeg.Encode(fBig, imgResized, &jpgOptions)
if err != nil { if err != nil {
log.Error("Error encoding big image:", err.Error()) log.Error("Error encoding big image: ", err.Error())
return "", "" return "", ""
} }
imgSmallResized, err := resizeImg(&img2, IMG_WIDTH_SMALL) imgSmallResized, err := resizeImg(&img2, IMG_WIDTH_SMALL)
if err != nil { if err != nil {
log.Error("Error resizing small image:", err.Error()) log.Error("Error resizing small image: ", err.Error())
return "", "" return "", ""
} }
err = jpeg.Encode(fSmall, imgSmallResized, &jpgOptions) err = jpeg.Encode(fSmall, imgSmallResized, &jpgOptions)
if err != nil { if err != nil {
log.Error("Error encoding small image:", err.Error()) log.Error("Error encoding small image: ", err.Error())
return "", "" return "", ""
} }

2
tasker.go
View file

@ -28,7 +28,7 @@ func tasker(task func() error, periodicity time.Duration) {
time.Sleep(periodicity) time.Sleep(periodicity)
err := task() err := task()
if err != nil { if err != nil {
log.Error("Task error:", err) log.Error("Task error: ", err)
} }
} }
} }

6
trantor.go
View file

@ -32,7 +32,7 @@ func logoutHandler(h handler) {
h.sess.LogOut() h.sess.LogOut()
h.sess.Notify("Log out!", "Bye bye "+h.sess.User, "success") h.sess.Notify("Log out!", "Bye bye "+h.sess.User, "success")
h.sess.Save(h.w, h.r) h.sess.Save(h.w, h.r)
log.Info("User", h.sess.User, "log out") log.Info("User ", h.sess.User, " log out")
http.Redirect(h.w, h.r, "/", http.StatusFound) http.Redirect(h.w, h.r, "/", http.StatusFound)
} }
@ -40,11 +40,11 @@ func loginHandler(h handler) {
user := h.r.FormValue("user") user := h.r.FormValue("user")
pass := h.r.FormValue("pass") pass := h.r.FormValue("pass")
if h.db.UserValid(user, pass) { if h.db.UserValid(user, pass) {
log.Info("User", user, "log in") log.Info("User ", user, " log in")
h.sess.LogIn(user) h.sess.LogIn(user)
h.sess.Notify("Successful login!", "Welcome "+user, "success") h.sess.Notify("Successful login!", "Welcome "+user, "success")
} else { } else {
log.Warn("User", user, "bad user or password") log.Warn("User ", user, " bad user or password")
h.sess.Notify("Invalid login!", "user or password invalid", "error") h.sess.Notify("Invalid login!", "user or password invalid", "error")
} }
h.sess.Save(h.w, h.r) h.sess.Save(h.w, h.r)

10
upload.go
View file

@ -36,7 +36,7 @@ func processFile(req uploadRequest, db *DB) {
epub, err := openMultipartEpub(req.file) epub, err := openMultipartEpub(req.file)
if err != nil { if err != nil {
log.Warn("Not valid epub uploaded file", req.filename, ":", err) log.Warn("Not valid epub uploaded file ", req.filename, ": ", err)
return return
} }
defer epub.Close() defer epub.Close()
@ -46,7 +46,7 @@ func processFile(req uploadRequest, db *DB) {
req.file.Seek(0, 0) req.file.Seek(0, 0)
id, size, err := StoreNewFile(title+".epub", req.file, db) id, size, err := StoreNewFile(title+".epub", req.file, db)
if err != nil { if err != nil {
log.Error("Error storing book (", title, "):", err) log.Error("Error storing book (", title, "): ", err)
return return
} }
@ -54,10 +54,10 @@ func processFile(req uploadRequest, db *DB) {
book["filesize"] = size book["filesize"] = size
err = db.InsertBook(book) err = db.InsertBook(book)
if err != nil { if err != nil {
log.Error("Error storing metadata (", title, "):", err) log.Error("Error storing metadata (", title, "): ", err)
return return
} }
log.Info("File uploaded:", req.filename) log.Info("File uploaded: ", req.filename)
} }
func uploadPostHandler(h handler) { func uploadPostHandler(h handler) {
@ -68,7 +68,7 @@ func uploadPostHandler(h handler) {
for _, f := range filesForm { for _, f := range filesForm {
file, err := f.Open() file, err := f.Open()
if err != nil { if err != nil {
log.Error("Can not open uploaded file", f.Filename, ":", err) log.Error("Can not open uploaded file ", f.Filename, ": ", err)
h.sess.Notify("Upload problem!", "There was a problem with book "+f.Filename, "error") h.sess.Notify("Upload problem!", "There was a problem with book "+f.Filename, "error")
problem = true problem = true
continue continue