Skip to content

Commit 2a60e06

Browse files
committed
CHEF-753 chef server slice should finish activating without the indexer
1 parent 5c3f412 commit 2a60e06

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,6 @@ def self.activate
6262

6363

6464
Thread.new do
65-
until EM.reactor_running?
66-
sleep 1
67-
end
68-
69-
Chef::Nanite.in_event { Chef::Log.info("Nanite is ready") }
70-
7165
unless Merb::Config.environment == "test"
7266
# create the couch design docs for nodes, roles, and databags
7367
Chef::CouchDB.new.create_id_map
@@ -100,6 +94,12 @@ def self.activate
10094
# Generate the Web UI Key
10195
Chef::Certificate.gen_validation_key(Chef::Config[:web_ui_client_name], Chef::Config[:web_ui_key])
10296
end
97+
98+
until EM.reactor_running?
99+
sleep 1
100+
end
101+
102+
Chef::Nanite.in_event { Chef::Log.info("Nanite is ready") }
103103
end
104104
end
105105

0 commit comments

Comments
 (0)