From eb73b903b204d179bbbecab2e6bba1a26f75373f Mon Sep 17 00:00:00 2001 From: Alex Dean Date: Sun, 8 Mar 2015 01:22:51 +0000 Subject: [PATCH] EmrEtlRunner: fixed copy to staging for Tomcat7 logs with hyphen after .txt (closes #1480) --- 3-enrich/emr-etl-runner/lib/snowplow-emr-etl-runner/s3_tasks.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3-enrich/emr-etl-runner/lib/snowplow-emr-etl-runner/s3_tasks.rb b/3-enrich/emr-etl-runner/lib/snowplow-emr-etl-runner/s3_tasks.rb index b7862e23dc..a97ed26f6f 100644 --- a/3-enrich/emr-etl-runner/lib/snowplow-emr-etl-runner/s3_tasks.rb +++ b/3-enrich/emr-etl-runner/lib/snowplow-emr-etl-runner/s3_tasks.rb @@ -90,7 +90,7 @@ def self.stage_logs_for_emr(args, config) # This will convert Beanstalk epoch timestamps to our CloudFront-like yyyy-MM-dd-HH final_name, final_extn = - if name_match = name.match(/^_*(.*)\.txt([[:digit:]]+)$/) + if name_match = name.match(/^_*(.*)\.txt-?([[:digit:]]+)$/) base, tstamp = name_match.captures begin tstamp_ymdh = Time.at(tstamp.to_i).utc.to_datetime.strftime("%Y-%m-%d-%H")