Skip to content

Commit d1d71b7

Browse files
committed
Log more if a folder does not exist
This commit reverts previous silencing of not found errors
1 parent 254c1c7 commit d1d71b7

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

lib/imap/backup/account/folder.rb

-7
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,12 @@ def initialize(client, name)
3131

3232
# @raise any error that occurs more than 10 times
3333
def exist?
34-
previous_level = Imap::Backup::Logger.logger.level
35-
previous_debug = Net::IMAP.debug
36-
Imap::Backup::Logger.logger.level = ::Logger::Severity::UNKNOWN
37-
Net::IMAP.debug = false
3834
retry_on_error(errors: EXAMINE_RETRY_CLASSES) do
3935
examine
4036
end
4137
true
4238
rescue FolderNotFound
4339
false
44-
ensure
45-
Imap::Backup::Logger.logger.level = previous_level
46-
Net::IMAP.debug = previous_debug
4740
end
4841

4942
# Creates the folder on the server

lib/imap/backup/account/folder_backup.rb

+6-3
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ def initialize(account:, folder:, refresh: false)
2222
# @raise [RuntimeError] if the configured download strategy is incorrect
2323
# @return [void]
2424
def run
25+
Logger.logger.debug "[#{folder.name}] running backup"
26+
2527
folder_ok = folder_ok?
2628
return if !folder_ok
2729

28-
Logger.logger.debug "[#{folder.name}] running backup"
29-
3030
serializer.apply_uid_validity(folder.uid_validity)
3131

3232
serializer.transaction do
@@ -46,7 +46,10 @@ def run
4646

4747
def folder_ok?
4848
begin
49-
return false if !folder.exist?
49+
if !folder.exist?
50+
Logger.logger.info "[#{folder.name}] skipping folder as it does not exist"
51+
return false
52+
end
5053
rescue Encoding::UndefinedConversionError
5154
message = "Skipping backup for '#{folder.name}' " \
5255
"as it is not UTF-7 encoded correctly"

0 commit comments

Comments
 (0)