X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Fprune%2Fprune_runner.rb;h=8ae8ad218bcbc402e167509dca190ab62cbec5fb;hp=12a02d7417500917557f6235f5d2c45244931077;hb=f819b178c5c1cb8adda0182c610e5c52fad8bea7;hpb=9a45da513ea3ceda803f841eca59ee1bd15b9e97 diff --git a/lib/prune/prune_runner.rb b/lib/prune/prune_runner.rb index 12a02d7..8ae8ad2 100644 --- a/lib/prune/prune_runner.rb +++ b/lib/prune/prune_runner.rb @@ -1,7 +1,6 @@ require 'common/runner' - -# This is always needed, regardless of which plugin is running. require 'prune/plugins/postfixadmin' +require 'rm/rm_runner' class PruneRunner include Runner @@ -16,21 +15,11 @@ class PruneRunner db_users = pfa.list_users() db_domains = pfa.list_domains() - leftover_users = plugin.get_leftover_users(db_users) - leftover_domains = plugin.get_leftover_domains(db_domains) - - leftover_users.each do |user| - user_description = plugin.describe_user(user) - plugin.delete_user(user) - report(plugin, "Removed user: #{user} (#{user_description})") - end - - leftover_domains.each do |domain| - domain_description = plugin.describe_domain(domain) - plugin.delete_domain(domain) - report(plugin, "Removed domain: #{domain} (#{domain_description})") - end + leftovers = plugin.get_leftover_users(db_users) + leftovers += plugin.get_leftover_domains(db_domains) + rm_runner = RmRunner.new() + rm_runner.run(plugin, *leftovers) end end