suzanne.soy/travis-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bump core and support. Travis::Metrics.setup

Browse Source
This commit is contained in:
Sven Fuchs 2013-09-16 16:43:03 +02:00
parent 2b6f2ceabe
commit bda2797f0e
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@ -3,8 +3,8 @@ ruby '2.1.2'
source 'https://rubygems.org' source 'https://rubygems.org'
gemspec gemspec
gem 'travis-core', github: 'travis-ci/travis-core', ref: 'master-2014-10-06' gem 'travis-core', github: 'travis-ci/travis-core', branch: 'sf-te'
gem 'travis-support', github: 'travis-ci/travis-support', ref: 'master-2014-10-06' gem 'travis-support', github: 'travis-ci/travis-support', branch: 'sf-te'
gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil, ref: 'cde9741' gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil, ref: 'cde9741'
gem 'travis-yaml', github: 'travis-ci/travis-yaml' gem 'travis-yaml', github: 'travis-ci/travis-yaml'
gem 'sinatra' gem 'sinatra'

28
Gemfile.lock
View File

@ -37,7 +37,8 @@ GIT
GIT GIT
remote: git://github.com/travis-ci/travis-core.git remote: git://github.com/travis-ci/travis-core.git
revision: 35f690bfb12bb0bef90297783e7c7ab15048dfc0 revision: 89b65f97ef0ffd00dd36ba38645034c8bcc0e250
branch: sf-te
specs: specs:
travis-core (0.0.1) travis-core (0.0.1)
actionmailer (~> 3.2.19) actionmailer (~> 3.2.19)
@ -48,8 +49,8 @@ GIT
hashr (~> 0.0.19) hashr (~> 0.0.19)
metriks (~> 0.9.7) metriks (~> 0.9.7)
multi_json multi_json
pusher (~> 0.11.0) pusher (~> 0.12.0)
railties (~> 3.2.19) railties (~> 3.2.12)
rake rake
redis (~> 3.0) redis (~> 3.0)
rollout (~> 1.1.0) rollout (~> 1.1.0)
@ -68,8 +69,8 @@ GIT
GIT GIT
remote: git://github.com/travis-ci/travis-support.git remote: git://github.com/travis-ci/travis-support.git
revision: a3af474254c8d2a5c829ce4be11ca53941361974 revision: 243147664e49a168b0c2d3c40c04a786bf664f37
ref: master-2014-10-06 branch: sf-te
specs: specs:
travis-support (0.0.1) travis-support (0.0.1)
@ -183,9 +184,9 @@ GEM
hashie (3.1.0) hashie (3.1.0)
hashr (0.0.22) hashr (0.0.22)
hike (1.2.3) hike (1.2.3)
hitimes (1.2.2) hitimes (1.2.1)
i18n (0.6.11) httpclient (2.3.4.1)
ice_nine (0.11.0) i18n (0.6.5)
journey (1.0.4) journey (1.0.4)
json (1.8.1) json (1.8.1)
kgio (2.9.2) kgio (2.9.2)
@ -206,9 +207,9 @@ GEM
mime-types (1.25.1) mime-types (1.25.1)
mocha (0.14.0) mocha (0.14.0)
metaclass (~> 0.0.1) metaclass (~> 0.0.1)
multi_json (1.10.1) multi_json (1.8.0)
multipart-post (2.0.0) multipart-post (1.2.0)
net-http-persistent (2.9.4) net-http-persistent (2.9)
net-http-pipeline (1.0.1) net-http-pipeline (1.0.1)
pg (0.13.2) pg (0.13.2)
polyglot (0.3.5) polyglot (0.3.5)
@ -217,7 +218,10 @@ GEM
coderay (~> 1.1.0) coderay (~> 1.1.0)
method_source (~> 0.8.1) method_source (~> 0.8.1)
slop (~> 3.4) slop (~> 3.4)
pusher (0.11.3) puma (2.3.1)
rack (>= 1.1, < 2.0)
pusher (0.12.0)
httpclient (~> 2.3.0)
multi_json (~> 1.0) multi_json (~> 1.0)
signature (~> 0.1.6) signature (~> 0.1.6)
rack (1.4.5) rack (1.4.5)

2
lib/travis/api/app.rb
View File

@ -185,6 +185,8 @@ module Travis::Api
Travis::LogSubscriber::ActiveRecordMetrics.attach Travis::LogSubscriber::ActiveRecordMetrics.attach
Travis::Notification.setup(instrumentation: false) Travis::Notification.setup(instrumentation: false)
# Travis::Metrics.setup from sf-te, does this conflict with the setup below?
if Travis.config.librato if Travis.config.librato
email, token, source = Travis.config.librato.email, email, token, source = Travis.config.librato.email,
Travis.config.librato.token, Travis.config.librato.token,