Skip to content

Commit 45bb618

Browse files
committed
暂时取消elastic_apm相关的设置
1 parent ba9fe28 commit 45bb618

4 files changed

Lines changed: 19 additions & 10 deletions

File tree

Gemfile

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ gem 'bootstrap', '~> 4.3.0'
113113
# gem 'elastic-apm'
114114
# gem "elasticsearch-model"
115115
# gem "elasticsearch-rails"
116-
#
116+
# 配套 es 的使用的搜索工具
117117
# gem 'searchkick'
118118

119119
# 用户系统
@@ -168,9 +168,6 @@ gem 'browser_warrior', '>= 0.8.0'
168168
# 用于处理跨域资源共享(CORS)的机架中间件,这使得跨域AJAX成为可能。
169169
# gem 'rack-cors'
170170

171-
# 文档工具
172-
# gem "sdoc", "~> 1.0.0.rc3"
173-
174171
# 赞、关注、收藏、屏蔽等功能的数据结构
175172
# gem "action-store"
176173

@@ -183,13 +180,13 @@ gem 'browser_warrior', '>= 0.8.0'
183180
# gem "rails-settings-cached", "~> 2.0"
184181

185182
# 一个使用 Ruby 连接和操作 RabbitMQ 的客户端
186-
# gem "bunny", ">= 2.14.1"
183+
gem "bunny", "~> 2.14.1"
187184
# 业务通过 Bunny 在 Rails 中简易、快速地生产发布了消息,就需要有消费者来接收和消费消息,
188185
# Sneakers 是一个处理 RabbitMQ 消息队列的高性能 Ruby 框架
189-
# gem 'sneakers'
186+
gem 'sneakers'
190187

191188
# aasm ruby类的状态机(支持普通Ruby,ActiveRecord,Mongoid)
192-
# gem 'aasm'
189+
gem 'aasm'
193190

194191
# 一些使用rack协议编写的小工具。
195192
gem "rack-contrib"

Gemfile.lock

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ GEM
4949
public_suffix (>= 2.0.2, < 5.0)
5050
airbrussh (1.4.0)
5151
sshkit (>= 1.6.1, != 1.7.0)
52+
amq-protocol (2.3.2)
5253
annotate (3.1.1)
5354
activerecord (>= 3.2, < 7.0)
5455
rake (>= 10.4, < 14.0)
@@ -87,6 +88,8 @@ GEM
8788
bullet (6.1.0)
8889
activesupport (>= 3.0.0)
8990
uniform_notifier (~> 1.11)
91+
bunny (2.14.4)
92+
amq-protocol (~> 2.3, >= 2.3.0)
9093
byebug (11.1.1)
9194
capistrano (3.12.1)
9295
airbrussh (>= 1.0.0)
@@ -517,17 +520,26 @@ GEM
517520
selenium-webdriver (3.142.7)
518521
childprocess (>= 0.5, < 4.0)
519522
rubyzip (>= 1.2.2)
523+
serverengine (2.0.7)
524+
sigdump (~> 0.2.2)
520525
sexp_processor (4.14.1)
521526
sidekiq (5.2.8)
522527
connection_pool (~> 2.2, >= 2.2.2)
523528
rack (< 2.1.0)
524529
rack-protection (>= 1.5.0)
525530
redis (>= 3.3.5, < 5)
531+
sigdump (0.2.4)
526532
simplecov (0.18.5)
527533
docile (~> 1.1)
528534
simplecov-html (~> 0.11)
529535
simplecov-html (0.12.2)
530536
slop (3.6.0)
537+
sneakers (2.11.0)
538+
bunny (~> 2.12)
539+
concurrent-ruby (~> 1.0)
540+
rake
541+
serverengine (~> 2.0.5)
542+
thor
531543
spring (2.1.0)
532544
spring-watcher-listen (2.0.1)
533545
listen (>= 2.7, < 4.0)
@@ -605,6 +617,7 @@ DEPENDENCIES
605617
browser_warrior (>= 0.8.0)
606618
bugsnag (~> 6.12)
607619
bullet
620+
bunny (~> 2.14.1)
608621
byebug
609622
capistrano (~> 3.11)
610623
capistrano-bundler (~> 1.5)
@@ -682,6 +695,7 @@ DEPENDENCIES
682695
selenium-webdriver
683696
sidekiq
684697
simplecov
698+
sneakers
685699
spring
686700
spring-watcher-listen (~> 2.0.0)
687701
sprockets (~> 3.0)

config/credentials.yml.enc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
vALRH/cDsc8YdfiHgD73u9FsDv/6Knj/1UgPuQd+h0I+srEl2hhsCw/g4DOrFwAQ4Ta0LzXDZfSZvgO9rg1OYJwOu9tnsHzVntbXkL4XjgdqfEFMmM5Mysmh+z2+HH5/T7GvQ3GjG/KuWCj9funP1YdlZJTAN3ABbcrara32uPBW5niN09JTUY3rcyfQ9TSE+vTktv+SG4z9lS8mcus1rQHkZrgDPURSxNrZkubPgzWkfohvi+aI/QCVL28r5eJOLEADB0i0ShE6n3RKU2N+Zs3vYTlUoZ6emlwyVgF3F/YW1ztJ/ROpi3UKdpBOEZjGub2p3Ofng6Zi7KHuzLRAICFXppiZbfp18MLiwKqgk2DwjiJAwJKI5B2tAzZ6QYamjQ8swnNJ2aS8dS0z09xB5AEzPuQgR8ytSST8+L0sjXYEelYogCd2bCI2Xv8TmCTDyjlHO4ql25IdjGJpGJ8/skGfQ9je6N4hI/K41lPoxdiMc9/bVWNQ0beAc39mS3zvCQdB0fjC+X1nNu1TY7gpyCEQxWgvKAMxo9wXhlt5fl/1Ye6OCAg1dsnSJ5Hw/uyvJqxE7hsXkOfsTi4u55cnrbUeoXxMn2rrvJ5pQqR5R6hnw9R60myddC4Itei3DkuoUVjJhygfm5gy42amPBqdy9rIYF0WsO8XMhHOLFWTwn3JhynW9rF3cyBmYTTD6BDGQXZGTu/l8tTsccY8j//DXuKPaEUN37gOTpC7IF/nFiTSNsyU/Ead1nzFig==--wziqPKk7kEokD/Ij--g9nlO3mfyGOoE3mBMN8Cpw==
1+
OW/W/YEgiiPXlPO3aY3uSVEKQ8lZV7CcbXU/SF31GrivdhKqSEXLKRQ83fpdm1XBHNTIxRsTUYpsUmoFrYwsWMel4tl923n0ha1BrYdShqXSOrwLkYKQ9RibS/ybnP/bp3mdKGKbvyh9J+1m9UMJtCUPP9+s6rq375D29Z2YFeRNTdGcRY2BVt2IWdshTR29vyqdasYFkJS3c4MDnHe7+TVmNJkoJ9Jdz3WypXKteO8hZm1kzIkR8/fhjFxgJJHbw3xlyL+9pjA3+ljM6RckNMq3QWpJpJjghyyc9sFGE5Z9pBE3QPXMyVo58d6hJjl8ntq71UGqs2+r9PzB3L00FzkqjJT2mYEAR7e+WJfQyHidAG9jwptbwu/Jup+8UMZ2pAjEP+DhA9QlSD5nVmi4fAw62N8aB60ng7aIO/XxDUtAG+5cnfNs5Jh/8T9mYx7ooEEy/WQ2Sa/PeNlJOURt89QUzycn0Us/lOkUxgIV8yBef5hWLSj5FIY3GrpUkEKb5Jn5jDpjamQkm5OqgOcP2xTR70uE61x/xrKcjFCO/bZNb930xSs+DcDHG7U/CewVnlxt6o45lzY/cLrD86YxnIwmG5rVEWJCLl+fMCVJu+c8EZ4/P0y1ZMoWHGOiAafJ57uO36k+Qg/Xfz7KbXRWcvUznZVqFtuWSCqwnRJnE+XSlFUDZc7r4cg3AKLbpMqrl71W4u4zWQHyz0dHVDYQLOcQt3r1kqVGBkqHOaWLNgOYpAys6AOs0USnv9eKcz43v43bj4cV2GPDBeMhf4sVBXQZlDgWaXJSnUHPfMoibuko+97OOLJaTWfex0v54dNVeOZ3ZjiYG7M7bc0v6oeTTtNGLnPZl5AzDj7m8fVzsA==--P5AIwOBine/Zxjx3--E9JbOadQKDEYB6ii6myCCQ==

config/elastic_apm.yml

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)