From 2ea07c3c2800b2864c76ac833c0a931b1964c590 Mon Sep 17 00:00:00 2001 From: Alex Dean Date: Sun, 21 Jul 2013 15:50:19 +0100 Subject: [PATCH] Fixed #280 --- .../storage-loader/lib/snowplow-storage-loader/config.rb | 5 ++++- CHANGELOG | 5 ++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/4-storage/storage-loader/lib/snowplow-storage-loader/config.rb b/4-storage/storage-loader/lib/snowplow-storage-loader/config.rb index 105b02f8a9..84482e64f3 100644 --- a/4-storage/storage-loader/lib/snowplow-storage-loader/config.rb +++ b/4-storage/storage-loader/lib/snowplow-storage-loader/config.rb @@ -41,7 +41,10 @@ def get_config() # Add trailing slashes if needed to the buckets and download folder config[:s3][:buckets].update(config[:s3][:buckets]){|k,v| Sluice::Storage::trail_slash(v)} - config[:download][:folder] = Sluice::Storage::trail_slash(config[:download][:folder]) + + unless config[:download][:folder].nil? # TODO: remove when Sluice's trail_slash can handle nil + config[:download][:folder] = Sluice::Storage::trail_slash(config[:download][:folder]) + end # Check we recognise the storage target unless @@storage_targets.include?(config[:storage][:type]) diff --git a/CHANGELOG b/CHANGELOG index cc4d1c3a97..a41116cd9c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -12,14 +12,13 @@ Hive ETL: removed folder 3-enrich/hive-etl as no longer supported (#286) Hive storage: updated hive-storage scripts to work with current Redshift-format flatfile (#290) Infobright: removed folder 4-storage/infobright as not currently supported (#285) Postgres: add Postgres table definition in atomic schema (#160) - StorageLoader: bumped to 0.1.0 StorageLoader: bumped Sluice 0.0.7 (#300) StorageLoader: removed code to delete Hive ETL's empty event files (#306) +StorageLoader: fixed bug where download path has to be set (even when using Redshift) (#280) -StorageLoader: fixed bug where download path has to be set (even when using Redshift) (#280) - TODO -StorageLoader: added max_error and treat_empty_as_null as StorageLoader configuration values for Redshift (#273) - TODO StorageLoader: tweaked ANALYZE and VACUUM commands (#283) - TODO +StorageLoader: added max_error and treat_empty_as_null as StorageLoader configuration values for Redshift (#273) - TODO StorageLoader: added support for loading Postgres (#161) - TODO StorageLoader: removed Infobright loading capability (#307) - TODO