Skip to content

Commit

Permalink
Merge pull request #21366 from agrare/remove_writing_memcached_config
Browse files Browse the repository at this point in the history
Remove writing of memcached config from evmserver
  • Loading branch information
Fryguy authored Aug 20, 2021
2 parents ad708e9 + 77474d4 commit 1ad1f72
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 18 deletions.
15 changes: 0 additions & 15 deletions app/models/miq_server/environment_management.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,6 @@ def get_network_information

[ipaddr, hostname, mac_address]
end

def start_memcached
# TODO: Need to periodically check the memcached instance to see if it's up, and bounce it and notify the UiWorkers to re-connect
return unless ::Settings.server.session_store.to_s == 'cache'
return unless MiqEnvironment::Command.supports_memcached?

require Rails.root.join("lib/miq_memcached").to_s unless Object.const_defined?(:MiqMemcached)

_svr, port = MiqMemcached.server_address.to_s.split(":")
opts = ::Settings.session.memcache_server_opts.to_s

MiqMemcached::Control.restart!(:port => port, :options => opts) if MiqMemcached::Config.new(:port => port, :options => opts).changed?

_log.info("Status: #{MiqMemcached::Control.status[1]}")
end
end

def disk_usage_threshold
Expand Down
1 change: 0 additions & 1 deletion config/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -988,7 +988,6 @@
:session:
:interval: 60
:memcache_server: 127.0.0.1:11211
:memcache_server_opts: "-l 127.0.0.1 -I 1M"
:show_login_info: true
:timeout: 3600
:log_threshold: 100.kilobytes
Expand Down
2 changes: 0 additions & 2 deletions lib/workers/evm_server.rb
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,6 @@ def start_server

EvmDatabase.seed_rest

MiqServer.start_memcached

MiqEvent.raise_evm_event(@current_server, "evm_server_start")

_log.info("Server starting...")
Expand Down

0 comments on commit 1ad1f72

Please sign in to comment.