Merge branch 'release/1.19.1'

nwtgck · Nov 11, 2018 · a8c1c5f · a8c1c5f
2 parents 358fe32 + a70c7f9
commit a8c1c5f
Show file tree

Hide file tree

Showing 8 changed files with 1,167 additions and 1,123 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
 
+## [1.19.1] - 2018-11-12
+### Fixed
+- Fix to notify an error to user when store process is failed
+
 ## [1.19.0] - 2018-11-10
 ### Added
 - Allow users to redirect URI by `/r/<File ID>`
@@ -148,7 +152,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 - Adapt [`sbt-native-packager`](https://github.com/sbt/sbt-native-packager) for [Heroku](https://heroku.com/)
 
 
-[Unreleased]: https://github.com/nwtgck/trans-server-akka/compare/v1.19.0...HEAD
+[Unreleased]: https://github.com/nwtgck/trans-server-akka/compare/v1.19.1...HEAD
+[1.19.1]: https://github.com/nwtgck/trans-server-akka/compare/v1.19.0...v1.19.1
 [1.19.0]: https://github.com/nwtgck/trans-server-akka/compare/v1.18.0...v1.19.0
 [1.18.0]: https://github.com/nwtgck/trans-server-akka/compare/v1.17.0...v1.18.0
 [1.17.0]: https://github.com/nwtgck/trans-server-akka/compare/v1.16.2...v1.17.0

diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ import sbtassembly.AssemblyPlugin.autoImport.assemblyJarName
 
 name := "trans-server-akka"
 
-version := "1.19.0"
+version := "1.19.1"
 
 scalaVersion := "2.11.12"
 

diff --git a/src/main/scala/io/github/nwtgck/trans_server/Core.scala b/src/main/scala/io/github/nwtgck/trans_server/Core.scala
@@ -149,6 +149,14 @@ class Core(db: Database, fileDbPath: String, enableTopPageHttpsRedirect: Boolean
         // Store a file and get content length
         (ioResult, rawLength, md5Digest, sha1Digest, sha256Digest) <- storeFuture
 
+        _ <- ioResult match {
+          case IOResult(_, Success(_)) =>
+            Future.successful(())
+          case IOResult(_, Failure(ex)) =>
+            // Fail because IOResult is failed
+            Future.failed(ex)
+        }
+
         // Create file store object
         fileStore = FileStore(
           fileId             = fileId,

diff --git a/src/test/resources/application.conf b/src/test/resources/application.conf
@@ -1,5 +1,5 @@
 // (from: https://stackoverflow.com/a/10157700/2885946)
 akka {
   event-handlers = ["akka.event.slf4j.Slf4jEventHandler"]
-  loglevel = "INFO"
+  loglevel = "OFF"
 }