diff options
Diffstat (limited to 'src/mongo/util')
| -rw-r--r-- | src/mongo/util/net/ssl_manager.cpp | 7 | ||||
| -rw-r--r-- | src/mongo/util/progress_meter.h | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/mongo/util/net/ssl_manager.cpp b/src/mongo/util/net/ssl_manager.cpp index 652807e7e71..d989d3b5559 100644 --- a/src/mongo/util/net/ssl_manager.cpp +++ b/src/mongo/util/net/ssl_manager.cpp @@ -693,10 +693,9 @@ namespace mongo { return false; } - if ((notBeforeMillis > curTimeMillis64()) || - (curTimeMillis64() > notAfterMillis)) { - dbexit(EXIT_BADOPTIONS, - "The provided SSL certificate is expired or not yet valid."); + if ((notBeforeMillis > curTimeMillis64()) || (curTimeMillis64() > notAfterMillis)) { + severe() << "The provided SSL certificate is expired or not yet valid."; + fassertFailedNoTrace(28652); } *serverCertificateExpirationDate = Date_t::fromMillisSinceEpoch(notAfterMillis); diff --git a/src/mongo/util/progress_meter.h b/src/mongo/util/progress_meter.h index 8b3adb9e633..bdcc83ddd14 100644 --- a/src/mongo/util/progress_meter.h +++ b/src/mongo/util/progress_meter.h @@ -107,7 +107,7 @@ namespace mongo { }; // e.g.: - // CurOp * op = txn.getCurOp(); + // CurOp * op = CurOp::get(txn); // ProgressMeterHolder pm(op->setMessage("index: (1/3) external sort", "Index: External Sort Progress", d->stats.nrecords, 10)); // loop { pm.hit(); } class ProgressMeterHolder : boost::noncopyable { |