Merge remote-tracking branch 'origin/develop' into develop

src/smeagol/routes/wiki.clj

@@ -165,7 +165,7 @@
   "Render a form to allow the upload of a file."
   [request]
   (let [params (keywordize-keys (:params request))
-        data-path (str util/content-dir "/content/uploads/")
+        data-path (str util/content-dir "/uploads/")
         git-repo (hist/load-or-init-repo util/content-dir)
         upload (:upload params)
         uploaded (if upload (ul/store-upload params data-path))

src/smeagol/uploads.clj

@@ -59,8 +59,12 @@
     (timbre/debug
       (str "store-upload mv file: " tmp-file " to: " path filename))
     (if tmp-file
-      (do
+      (try
-        (.renameTo tmp-file
+        (do
-                   (File. (str path filename)))
+          (.renameTo tmp-file
-        filename)
+                     (File. (str path filename)))
+          filename)
+        (catch Exception x
+          (timbre/error (str "Failed to move " tmp-file " to " path filename "; " (type x) ": " (.getMessage x)))
+          (throw x)))
       (throw (Exception. "No file found?")))))

src/smeagol/util.clj

@@ -66,8 +66,9 @@
                      (timbre/error
                        any
                        (str
-                         "Failed to parse accept-language header "
+                         "Failed to parse accept-language header '"
-                         specifier))
+                         specifier
+                         "'"))
                      {}))]
     (merge
       messages