diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2015-02-20 17:55:41 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2015-02-20 17:55:41 +0000 |
| commit | bb06603d5fa26679e0c156f6ef7b4b275e9fecb6 (patch) | |
| tree | 5fabb4105621b3ac36c277cbc43b5a50afc0c356 /channels/sig_analog.c | |
| parent | 340818ad12b6265e8967da2146188488fc7a5bf2 (diff) | |
chan_dahdi/sig_analog: Put log message strings on one line.
With the log messages on one line, you can search for the log message seen
in the log and expect to find it.
........
Merged revisions 432032 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 432034 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@432036 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/sig_analog.c')
| -rw-r--r-- | channels/sig_analog.c | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/channels/sig_analog.c b/channels/sig_analog.c index c24df6915..0c7701772 100644 --- a/channels/sig_analog.c +++ b/channels/sig_analog.c @@ -2413,8 +2413,8 @@ static void *__analog_ss_thread(void *data) * or AST_FLAG_END_DTMF_ONLY flag settings since we * are hanging up the channel. */ - ast_log(LOG_WARNING, "DTMFCID timed out waiting for ring. " - "Exiting simple switch\n"); + ast_log(LOG_WARNING, + "DTMFCID timed out waiting for ring. Exiting simple switch\n"); ast_hangup(chan); goto quit; } @@ -2508,8 +2508,8 @@ static void *__analog_ss_thread(void *data) res = ast_waitfor(chan, ms); if (res <= 0) { - ast_log(LOG_WARNING, "CID timed out waiting for ring. " - "Exiting simple switch\n"); + ast_log(LOG_WARNING, + "CID timed out waiting for ring. Exiting simple switch\n"); ast_hangup(chan); goto quit; } @@ -2535,10 +2535,8 @@ static void *__analog_ss_thread(void *data) ast_log(LOG_WARNING, "Unable to get caller ID space\n"); } } else { - ast_log(LOG_WARNING, "Channel %s in prering " - "state, but I have nothing to do. " - "Terminating simple switch, should be " - "restarted by the actual ring.\n", + ast_log(LOG_WARNING, + "Channel %s in prering state, but I have nothing to do. Terminating simple switch, should be restarted by the actual ring.\n", ast_channel_name(chan)); ast_hangup(chan); goto quit; @@ -3838,8 +3836,7 @@ void *analog_handle_init_event(struct analog_pvt *i, int event) } if (i->cid_start == ANALOG_CID_START_POLARITY || i->cid_start == ANALOG_CID_START_POLARITY_IN) { i->polarity = POLARITY_REV; - ast_verb(2, "Starting post polarity " - "CID detection on channel %d\n", + ast_verb(2, "Starting post polarity CID detection on channel %d\n", i->channel); chan = analog_new_ast_channel(i, AST_STATE_PRERING, 0, ANALOG_SUB_REAL, NULL); i->ss_astchan = chan; @@ -3853,9 +3850,9 @@ void *analog_handle_init_event(struct analog_pvt *i, int event) ast_callid_threadstorage_auto_clean(callid, callid_created); break; default: - ast_log(LOG_WARNING, "handle_init_event detected " - "polarity reversal on non-FXO (ANALOG_SIG_FXS) " - "interface %d\n", i->channel); + ast_log(LOG_WARNING, + "handle_init_event detected polarity reversal on non-FXO (ANALOG_SIG_FXS) interface %d\n", + i->channel); break; } break; @@ -3880,9 +3877,9 @@ void *analog_handle_init_event(struct analog_pvt *i, int event) ast_callid_threadstorage_auto_clean(callid, callid_created); break; default: - ast_log(LOG_WARNING, "handle_init_event detected " - "dtmfcid generation event on non-FXO (ANALOG_SIG_FXS) " - "interface %d\n", i->channel); + ast_log(LOG_WARNING, + "handle_init_event detected dtmfcid generation event on non-FXO (ANALOG_SIG_FXS) interface %d\n", + i->channel); break; } break; |