From 8432fe8a3e4d8eca7e2f66b018011cc4ed7d0599 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 9 Dec 2014 14:43:30 -0600 Subject: [PATCH] Revert "Bug 1169306: Clean up standalone db gear http conf in watchman." --- .../conf/watchman/plugins.d/frontend_plugin.rb | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/node-util/conf/watchman/plugins.d/frontend_plugin.rb b/node-util/conf/watchman/plugins.d/frontend_plugin.rb index bc003b20f27..d7314803ed0 100644 --- a/node-util/conf/watchman/plugins.d/frontend_plugin.rb +++ b/node-util/conf/watchman/plugins.d/frontend_plugin.rb @@ -67,22 +67,6 @@ def apply(iteration) FileUtils.rm_r(gear_dir) end - # Cleanup the empty conf gear directories. For e.g. directories for scalable - # application's db gears. - Dir.glob(PathUtils.join(conf_dir, '*')).each do |entry| - next unless File.directory?(entry) - next unless Dir["#{entry}/*"].empty? - - # Verify name is of the form we expect for these directories i.e. gearuuid_domain_gearuuid - dir_name = File.basename(entry) - next if /(.*)_(.*)_(.*)/ !~ dir_name - dir_name_parts = dir_name.split('_') - next if dir_name_parts[0] != dir_name_parts[2] - - FileUtils.rm_r(entry) - @logger.info %Q(watchman frontend plugin cleaned up #{entry}) - end - if reload_needed ::OpenShift::Runtime::Frontend::Http::Plugins::reload_httpd end