Make describe_domain work (for DovecotMailstore) even after a domain is removed.

[mailshears.git] / src / plugins / dovecot_mailstore.rb

diff --git a/src/plugins/dovecot_mailstore.rb b/src/plugins/dovecot_mailstore.rb
index ee12da905412a207f9e092b60507382fb84ab16d..40b201924514e032ee3349e1e1aa01aaa00adaa3 100644 (file)
--- a/src/plugins/dovecot_mailstore.rb
+++ b/src/plugins/dovecot_mailstore.rb
@@ -1,19 +1,32 @@
 require 'src/errors'
 require 'src/filesystem'
 require 'src/mailstore'
+require 'src/plugin'
 
 class DovecotMailstore < Mailstore
 
+  include Plugin
+
   def initialize
     @domain_root = Configuration::MAIL_ROOT
   end
 
   def describe_domain(domain)
-    return get_domain_path(domain)
+    begin
+      domain_path = get_domain_path(domain)
+      return domain_path
+    rescue NonexistentDomainError => e
+      return e.message
+    end
   end
 
   def describe_account(account)
-    return get_account_path(account)
+    begin
+      account_path = get_account_path(account)
+      return account_path
+    rescue NonexistentAccountError => e
+      return e.message
+    end
   end
 
   def delete_domain(domain)