Merge branch 'release/0.4.1'

snowplow · Jun 1, 2016 · bdb6ca5 · bdb6ca5
2 parents 2958546 + fad1138
commit bdb6ca5
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,6 @@ scala:
   - 2.10.1
 jdk:
   - oraclejdk7
-  - openjdk7
 
 before_script:
   - echo yes | sudo apt-get install lzop liblzo2-dev
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,8 @@
+Version 0.4.1 (2016-06-01)
+--------------------------
+Crash when unable to find stream instead of hanging (#58)
+Remove openjdk7 from .travis.yml (#60)
+
 Version 0.4.0 (2015-08-26)
 --------------------------
 Changed sink_write_failed to storage_write_failed (#45)

diff --git a/README.md b/README.md
@@ -49,7 +49,7 @@ NOTE: These are already installed in the Vagrant quickstart environment.
 The Kinesis S3 LZO Sink has the following command-line interface:
 
 ```
-snowplow-kinesis-s3: Version 0.4.0. Copyright (c) 2014-2015, Snowplow Analytics
+snowplow-kinesis-s3: Version 0.4.1. Copyright (c) 2014-2015, Snowplow Analytics
 Ltd.
 
 Usage: snowplow-lzo-s3-sink [OPTIONS]
@@ -99,7 +99,7 @@ limitations under the License.
 [travis-image]: https://travis-ci.org/snowplow/kinesis-s3.png?branch=master
 [travis]: http://travis-ci.org/snowplow/kinesis-s3
 
-[release-image]: http://img.shields.io/badge/release-0.4.0-blue.svg?style=flat
+[release-image]: http://img.shields.io/badge/release-0.4.1-blue.svg?style=flat
 [releases]: https://github.com/snowplow/kinesis-s3/releases
 
 [license-image]: http://img.shields.io/badge/license-Apache--2-blue.svg?style=flat

diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala
@@ -20,7 +20,7 @@ object BuildSettings {
   // Basic settings for our app
   lazy val basicSettings = Seq[Setting[_]](
     organization          :=  "com.snowplowanalytics",
-    version               :=  "0.4.0",
+    version               :=  "0.4.1",
     description           :=  "Kinesis LZO sink for S3",
     scalaVersion          :=  "2.10.1",
     scalacOptions         :=  Seq("-deprecation", "-encoding", "utf8",

diff --git a/src/main/scala/com.snowplowanalytics.snowplow.storage.kinesis/s3/SinkApp.scala b/src/main/scala/com.snowplowanalytics.snowplow.storage.kinesis/s3/SinkApp.scala
@@ -119,6 +119,10 @@ object SinkApp extends App {
 
   executor.run()
 
+  // If the stream cannot be found, the KCL's "cw-metrics-publisher" thread will prevent the
+  // application from exiting naturally so we explicitly call System.exit.
+  System.exit(1)
+
   /**
    * This function converts the config file into the format
    * expected by the Kinesis connector interfaces.