From f3ef9b667512b59f7c60de18534d0cfb9cd16921 Mon Sep 17 00:00:00 2001 From: Las Zenow Date: Tue, 11 Feb 2014 13:13:43 +0100 Subject: [PATCH] Add spaces to log messages --- cover.go | 14 +++++++------- tasker.go | 2 +- trantor.go | 6 +++--- upload.go | 10 +++++----- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cover.go b/cover.go index 08a2683..c6e3bae 100644 --- a/cover.go +++ b/cover.go @@ -49,7 +49,7 @@ func coverHandler(h handler) { f, err = fs.OpenId(book.Cover) } if err != nil { - log.Error("Error while opening image:", err) + log.Error("Error while opening image: ", err) notFound(h) return } @@ -145,14 +145,14 @@ func storeImg(img io.Reader, title string, db *DB) (bson.ObjectId, bson.ObjectId /* open the files */ fBig, err := createCoverFile(title, db) if err != nil { - log.Error("Error creating", title, ":", err.Error()) + log.Error("Error creating ", title, ": ", err.Error()) return "", "" } defer fBig.Close() fSmall, err := createCoverFile(title+"_small", db) if err != nil { - log.Error("Error creating", title+"_small", ":", err.Error()) + log.Error("Error creating ", title+"_small", ": ", err.Error()) return "", "" } 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} imgResized, err := resizeImg(img1, IMG_WIDTH_BIG) if err != nil { - log.Error("Error resizing big image:", err.Error()) + log.Error("Error resizing big image: ", err.Error()) return "", "" } err = jpeg.Encode(fBig, imgResized, &jpgOptions) if err != nil { - log.Error("Error encoding big image:", err.Error()) + log.Error("Error encoding big image: ", err.Error()) return "", "" } imgSmallResized, err := resizeImg(&img2, IMG_WIDTH_SMALL) if err != nil { - log.Error("Error resizing small image:", err.Error()) + log.Error("Error resizing small image: ", err.Error()) return "", "" } err = jpeg.Encode(fSmall, imgSmallResized, &jpgOptions) if err != nil { - log.Error("Error encoding small image:", err.Error()) + log.Error("Error encoding small image: ", err.Error()) return "", "" } diff --git a/tasker.go b/tasker.go index 1b0e6b3..e057874 100644 --- a/tasker.go +++ b/tasker.go @@ -28,7 +28,7 @@ func tasker(task func() error, periodicity time.Duration) { time.Sleep(periodicity) err := task() if err != nil { - log.Error("Task error:", err) + log.Error("Task error: ", err) } } } diff --git a/trantor.go b/trantor.go index bcb8e1f..78ab4f5 100644 --- a/trantor.go +++ b/trantor.go @@ -32,7 +32,7 @@ func logoutHandler(h handler) { h.sess.LogOut() h.sess.Notify("Log out!", "Bye bye "+h.sess.User, "success") 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) } @@ -40,11 +40,11 @@ func loginHandler(h handler) { user := h.r.FormValue("user") pass := h.r.FormValue("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.Notify("Successful login!", "Welcome "+user, "success") } 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.Save(h.w, h.r) diff --git a/upload.go b/upload.go index 66ae756..8f05f0a 100644 --- a/upload.go +++ b/upload.go @@ -36,7 +36,7 @@ func processFile(req uploadRequest, db *DB) { epub, err := openMultipartEpub(req.file) if err != nil { - log.Warn("Not valid epub uploaded file", req.filename, ":", err) + log.Warn("Not valid epub uploaded file ", req.filename, ": ", err) return } defer epub.Close() @@ -46,7 +46,7 @@ func processFile(req uploadRequest, db *DB) { req.file.Seek(0, 0) id, size, err := StoreNewFile(title+".epub", req.file, db) if err != nil { - log.Error("Error storing book (", title, "):", err) + log.Error("Error storing book (", title, "): ", err) return } @@ -54,10 +54,10 @@ func processFile(req uploadRequest, db *DB) { book["filesize"] = size err = db.InsertBook(book) if err != nil { - log.Error("Error storing metadata (", title, "):", err) + log.Error("Error storing metadata (", title, "): ", err) return } - log.Info("File uploaded:", req.filename) + log.Info("File uploaded: ", req.filename) } func uploadPostHandler(h handler) { @@ -68,7 +68,7 @@ func uploadPostHandler(h handler) { for _, f := range filesForm { file, err := f.Open() 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") problem = true continue