using the production pusher key with RUN_API causes tons of 404 errors
This commit is contained in:
parent
551b976bbc
commit
b35763baa3
|
@ -33,7 +33,7 @@ Travis.reopen
|
||||||
@set('auth', Travis.Auth.create(app: this, endpoint: Travis.config.api_endpoint))
|
@set('auth', Travis.Auth.create(app: this, endpoint: Travis.config.api_endpoint))
|
||||||
|
|
||||||
@slider = new Travis.Slider()
|
@slider = new Travis.Slider()
|
||||||
@pusher = new Travis.Pusher(Travis.config.pusher)
|
@pusher = new Travis.Pusher(Travis.config.pusher_key)
|
||||||
@tailing = new Travis.Tailing()
|
@tailing = new Travis.Tailing()
|
||||||
|
|
||||||
signIn: ->
|
signIn: ->
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
Travis.Pusher = (config) ->
|
Travis.Pusher = (key) ->
|
||||||
@init(config) if config
|
@init(key) if key
|
||||||
this
|
this
|
||||||
|
|
||||||
$.extend Travis.Pusher,
|
$.extend Travis.Pusher,
|
||||||
|
@ -9,9 +9,9 @@ $.extend Travis.Pusher,
|
||||||
$.extend Travis.Pusher.prototype,
|
$.extend Travis.Pusher.prototype,
|
||||||
active_channels: []
|
active_channels: []
|
||||||
|
|
||||||
init: (config) ->
|
init: (key) ->
|
||||||
Pusher.warn = @warn.bind(this)
|
Pusher.warn = @warn.bind(this)
|
||||||
@pusher = new Pusher(config.key)
|
@pusher = new Pusher(key)
|
||||||
@subscribe(channel) for channel in Travis.Pusher.CHANNELS
|
@subscribe(channel) for channel in Travis.Pusher.CHANNELS
|
||||||
|
|
||||||
subscribe: (channel) ->
|
subscribe: (channel) ->
|
||||||
|
|
|
@ -37,7 +37,7 @@ class Travis::Web::App
|
||||||
end
|
end
|
||||||
|
|
||||||
def pusher_key
|
def pusher_key
|
||||||
config.fetch(:pusher_key, DEFAULT_PUSHER_KEY)
|
config.fetch(:pusher_key, run_api? ? '' : DEFAULT_PUSHER_KEY)
|
||||||
end
|
end
|
||||||
|
|
||||||
def deflate?
|
def deflate?
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -1 +1 @@
|
||||||
5ed73cec
|
2d6e5c78
|
Loading…
Reference in New Issue
Block a user