Download as
Browse Code »

Commit bc15e931de0bf988c2d3f3de2c0d0d164341509e

Authored by Rodrigo Souto
1 parent be3839f9
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Removing solr server from scripts

Showing 6 changed files with 55 additions and 31 deletions   Show diff stats
config/solr.yml.dist
View file @be3839f
... ... @@ -1,25 +0,0 @@
1   -# Config file for the acts_as_solr plugin.
2   -#
3   -# If you change the host or port number here, make sure you update
4   -# them in your Solr config file
5   -
6   -# No change is needed to support multitenancy. Only one solr environment will be used.
7   -# Just remember to use 'rake multitenancy:reindex' for reindexation.
8   -
9   -production:
10   - url: http://127.0.0.1:8983/solr
11   - jvm_options: -server -Xmx192M -Xms64M
12   - timeout: 0
13   -
14   -development:
15   - url: http://0.0.0.0:8982/solr
16   - jvm_options: -server -Xmx128M -Xms16M
17   - timeout: 0
18   -
19   -test: &TEST
20   - url: http://0.0.0.0:8981/solr
21   - jvm_options: -server -Xmx128M -Xms16M
22   - timeout: 0
23   -
24   -cucumber:
25   - <<: *TEST
plugins/solr/after_enable.rb
  Diff comments   View file @bc15e93
1   -puts "\nI: \e[33mAfter enabling solr you might want to run: $rake solr:reindex\e[0m\n\n"
  1 +puts "\n"
  2 +puts "I: \e[33mTo reindex your contents run: $ rake solr:reindex\e[0m"
  3 +puts "I: \e[33mIf you want to run solr server on this machine you can download it running: $ rake solr:download\e[0m"
  4 +puts "I: \e[33mMake sure your solr server is running!\e[0m"
  5 +puts "\n"
... ...
plugins/solr/config/solr.yml 0 → 100644
  Diff comments   View file @bc15e93
... ... @@ -0,0 +1,25 @@
  1 +# Config file for the acts_as_solr plugin.
  2 +#
  3 +# If you change the host or port number here, make sure you update
  4 +# them in your Solr config file
  5 +
  6 +# No change is needed to support multitenancy. Only one solr environment will be used.
  7 +# Just remember to use 'rake multitenancy:reindex' for reindexation.
  8 +
  9 +production:
  10 + url: http://127.0.0.1:8983/solr
  11 + jvm_options: -server -Xmx192M -Xms64M
  12 + timeout: 0
  13 +
  14 +development:
  15 + url: http://0.0.0.0:8982/solr
  16 + jvm_options: -server -Xmx128M -Xms16M
  17 + timeout: 0
  18 +
  19 +test: &TEST
  20 + url: http://0.0.0.0:8981/solr
  21 + jvm_options: -server -Xmx128M -Xms16M
  22 + timeout: 0
  23 +
  24 +cucumber:
  25 + <<: *TEST
... ...
plugins/solr/config/solr.yml.dist 0 → 100644
  Diff comments   View file @bc15e93
... ... @@ -0,0 +1,25 @@
  1 +# Config file for the acts_as_solr plugin.
  2 +#
  3 +# If you change the host or port number here, make sure you update
  4 +# them in your Solr config file
  5 +
  6 +# No change is needed to support multitenancy. Only one solr environment will be used.
  7 +# Just remember to use 'rake multitenancy:reindex' for reindexation.
  8 +
  9 +production:
  10 + url: http://127.0.0.1:8983/solr
  11 + jvm_options: -server -Xmx192M -Xms64M
  12 + timeout: 0
  13 +
  14 +development:
  15 + url: http://0.0.0.0:8982/solr
  16 + jvm_options: -server -Xmx128M -Xms16M
  17 + timeout: 0
  18 +
  19 +test: &TEST
  20 + url: http://0.0.0.0:8981/solr
  21 + jvm_options: -server -Xmx128M -Xms16M
  22 + timeout: 0
  23 +
  24 +cucumber:
  25 + <<: *TEST
... ...
script/development
  Diff comments   View file @bc15e93
... ... @@ -5,13 +5,11 @@ export RAILS_ENV=development
5 5 stop() {
6 6 ./script/delayed_job stop
7 7 ./script/feed-updater stop
8   - rake -s solr:stop
9 8 exit
10 9 }
11 10  
12 11 start() {
13 12 ./script/feed-updater start
14   - rake -s solr:start
15 13 ./script/delayed_job start
16 14 trap stop INT TERM
17 15 ./script/server $@
... ...
script/production
  Diff comments   View file @bc15e93
... ... @@ -28,7 +28,6 @@ clear_cache() {
28 28 do_start() {
29 29 rake db:migrate SCHEMA=/dev/null
30 30 clear_cache
31   - rake -s solr:start
32 31 environments_loop start
33 32 ruby -S thin -C config/thin.yml start
34 33 }
... ... @@ -44,8 +43,6 @@ do_stop() {
44 43  
45 44 environments_loop stop ||
46 45 stop_via_pid_file tmp/pids/delayed_job.pid tmp/pids/delayed_job.*.pid tmp/pids/feed-updater.*.pid
47   -
48   - rake -s solr:stop || stop_via_pid_file tmp/pids/solr.*.pid
49 46 }
50 47  
51 48 stop_via_pid_file() {
... ...