Skip to content

Commit abe3374

Browse files
committed
No longer need to load roles at startup
1 parent 8558edd commit abe3374

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

chef-server-api/lib/chef-server-api.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ def self.activate
6262
Mixlib::Authentication::Log.logger = Nanite::Log.logger = Ohai::Log.logger = Chef::Log.logger
6363

6464
Thread.new do
65+
Chef::Log.level = :debug
6566
# Okay, we're here because if you run this with the thin adaptor, you
6667
# need to wait for EM to heat all the way up - and it won't, until
6768
# after activate is finished.
@@ -71,7 +72,7 @@ def self.activate
7172
# This is because nanite needs to broadcast, and we don't know how long
7273
# that will take.
7374
20.downto(0) do |sleep_time|
74-
Chef::Log.debug("Waiting for Nanite to heat up.. #{sleep_time} seconds left")
75+
Chef::Log.info("Waiting for Nanite to heat up.. #{sleep_time} seconds left")
7576
sleep 1
7677
end
7778

@@ -84,9 +85,6 @@ def self.activate
8485
Chef::ApiClient.create_design_document
8586
Chef::WebUIUser.create_design_document
8687

87-
Chef::Log.info('Loading roles')
88-
Chef::Role.sync_from_disk_to_couchdb
89-
9088
# Create the signing key and certificate
9189
Chef::Certificate.generate_signing_ca
9290

0 commit comments

Comments
 (0)