Repository: trafficserver Updated Branches: refs/heads/master 6a36346df -> 3fd3b6689
mgmt: use mgmt_fatal rather than a raw assert() Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/6f7e00ec Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/6f7e00ec Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/6f7e00ec Branch: refs/heads/master Commit: 6f7e00ecbe620500625d2c62786e5bd300749d8d Parents: 6a36346 Author: James Peach <[email protected]> Authored: Sat Oct 24 10:17:48 2015 -0700 Committer: James Peach <[email protected]> Committed: Sat Oct 24 10:17:48 2015 -0700 ---------------------------------------------------------------------- mgmt/LocalManager.cc | 3 +-- mgmt/utils/MgmtUtils.h | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6f7e00ec/mgmt/LocalManager.cc ---------------------------------------------------------------------- diff --git a/mgmt/LocalManager.cc b/mgmt/LocalManager.cc index 9d41a8a..57cd222 100644 --- a/mgmt/LocalManager.cc +++ b/mgmt/LocalManager.cc @@ -695,9 +695,8 @@ LocalManager::sendMgmtMsgToProcesses(MgmtMessageHdr *mh) if (!(configFiles && configFiles->getRollbackObj(fname, &rb)) && (strcmp(data_raw, "proxy.config.cluster.cluster_configuration") != 0) && (strcmp(data_raw, "proxy.config.body_factory.template_sets_dir") != 0)) { - mgmt_elog(stderr, 0, "[LocalManager::sendMgmtMsgToProcesses] " + mgmt_fatal(stderr, 0, "[LocalManager::sendMgmtMsgToProcesses] " "Invalid 'data_raw' for MGMT_EVENT_CONFIG_FILE_UPDATE\n"); - ink_assert(false); } ats_free(fname); break; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6f7e00ec/mgmt/utils/MgmtUtils.h ---------------------------------------------------------------------- diff --git a/mgmt/utils/MgmtUtils.h b/mgmt/utils/MgmtUtils.h index b4271a8..b9d1fd0 100644 --- a/mgmt/utils/MgmtUtils.h +++ b/mgmt/utils/MgmtUtils.h @@ -57,10 +57,10 @@ bool mgmt_getAddrForIntr(char *intrName, sockaddr *addr, int *mtu = 0); interface should be used exclusively in the future */ void mgmt_log(FILE *log, const char *message_format, ...); void mgmt_elog(FILE *log, const int lerrno, const char *message_format, ...); -void mgmt_fatal(FILE *log, const int lerrno, const char *message_format, ...); +void mgmt_fatal(FILE *log, const int lerrno, const char *message_format, ...) TS_NORETURN; void mgmt_log(const char *message_format, ...); void mgmt_elog(const int lerrno, const char *message_format, ...); -void mgmt_fatal(const int lerrno, const char *message_format, ...); +void mgmt_fatal(const int lerrno, const char *message_format, ...) TS_NORETURN; void mgmt_log_output(FILE *stdio_or_null, DiagsLevel type, const char *format, ...); void mgmt_log_output_va(FILE *stdio_or_null, DiagsLevel type, const char *format, va_list ap);
