From 6505a058d6868f17a40a105211a75d7926207b54 Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Tue, 5 Apr 2016 18:09:41 +0200 Subject: [PATCH] pass through Env.pusher.channelPrefix for enterprise --- waiter/config.ru | 1 + waiter/lib/travis/web/app.rb | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/waiter/config.ru b/waiter/config.ru index 1a640ac6..e77d7e88 100644 --- a/waiter/config.ru +++ b/waiter/config.ru @@ -59,6 +59,7 @@ run Travis::Web::App.build( pusher_key: ENV['PUSHER_KEY'], pusher_host: ENV['PUSHER_HOST'] || 'ws.pusherapp.com', pusher_path: ENV['PUSHER_PATH'], + pusher_channel_prefix: ENV['PUSHER_CHANNEL_PREFIX'], ga_code: ENV['GA_CODE'], root: File.expand_path('../../dist', __FILE__), server_start: Time.now, diff --git a/waiter/lib/travis/web/app.rb b/waiter/lib/travis/web/app.rb index d681902e..c00bcfee 100644 --- a/waiter/lib/travis/web/app.rb +++ b/waiter/lib/travis/web/app.rb @@ -141,7 +141,7 @@ class Travis::Web::App def expires(file) if fingerprinted?(file) - (server_start + age).httpdate + (server_start + age).httpdate else '0' end @@ -189,6 +189,7 @@ class Travis::Web::App pusher['key'] = options[:pusher_key] if options[:pusher_key] pusher['host'] = options[:pusher_host] if options[:pusher_host] pusher['path'] = options[:pusher_path] if options[:pusher_path] + pusher['channel_prefix'] = options[:pusher_channel_prefix] if options[:pusher_channel_prefix] config['pusher'] = pusher config['ember-cli-pendo'] = { apiKey: options[:pendo_key] }