Skip to content

Commit

Permalink
Merge branch 'master' of github.com:ceph-dovecot/dovecot-ceph-plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
jrse committed May 24, 2022
2 parents 1f8bbac + 5b2a53b commit 845a1c0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 1 addition & 2 deletions src/storage-rbox/rbox-save.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -532,8 +532,7 @@ int save_mail_async(RadosStorage *rados_storage,
ret_val = failed ? -1 : 0;
i_debug("completion return value %d",ret_val);
}
completion->release();


// deprecated unused
current_object->set_write_operation(nullptr);
current_object->set_completion(nullptr);
Expand Down
4 changes: 3 additions & 1 deletion src/storage-rbox/rbox-storage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,8 @@ int rbox_open_rados_connection(struct mailbox *box, bool alt_storage) {
? librmb::WAIT_FOR_SAFE_AND_CB
: librmb::WAIT_FOR_COMPLETE_AND_CB);
}
} catch (std::exception &e) {
} catch (std::exception &e) {
i_error("Exception: setting up ceph connection: %s",e.what());
ret = -1;
}

Expand All @@ -480,6 +481,7 @@ int rbox_open_rados_connection(struct mailbox *box, bool alt_storage) {
#endif
return 0;
}

if (ret < 0) {
i_error(
"Open rados connection. Error(%d,%s) (pool_name(%s), cluster_name(%s), rados_user_name(%s), "
Expand Down

0 comments on commit 845a1c0

Please sign in to comment.