]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Per-call logging, part two
authorMathieu Rene <mrene@avgs.ca>
Thu, 13 Aug 2009 21:24:51 +0000 (21:24 +0000)
committerMathieu Rene <mrene@avgs.ca>
Thu, 13 Aug 2009 21:24:51 +0000 (21:24 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14510 d0543943-73ff-0310-b7d9-9358b9ac24b2

22 files changed:
src/mod/applications/mod_commands/mod_commands.c
src/mod/applications/mod_conference/mod_conference.c
src/mod/applications/mod_curl/mod_curl.c
src/mod/applications/mod_dptools/mod_dptools.c
src/mod/applications/mod_easyroute/mod_easyroute.c
src/mod/applications/mod_esf/mod_esf.c
src/mod/applications/mod_fax/mod_fax.c
src/mod/applications/mod_fifo/mod_fifo.c
src/mod/applications/mod_fsv/mod_fsv.c
src/mod/applications/mod_lcr/mod_lcr.c
src/mod/applications/mod_limit/mod_limit.c
src/mod/applications/mod_memcache/mod_memcache.c
src/mod/applications/mod_nibblebill/mod_nibblebill.c
src/mod/applications/mod_rss/mod_rss.c
src/mod/applications/mod_soundtouch/mod_soundtouch.cpp
src/mod/applications/mod_spy/mod_spy.c
src/mod/applications/mod_stress/mod_stress.cpp
src/mod/applications/mod_t38gateway/mod_t38gateway.c
src/mod/applications/mod_vmd/mod_vmd.c
src/mod/applications/mod_voicemail/mod_voicemail.c
src/switch_core_io.c
src/switch_core_memory.c

index 3995ebc004c0dc09467870ad08eff1d235d40a6c..348f44f13719f82dcc859d8b059aba180db728f3 100644 (file)
@@ -1590,7 +1590,7 @@ SWITCH_STANDARD_API(tone_detect_session_function)
        switch_assert(mydata != NULL);
 
        if ((argc = switch_separate_string(mydata, ' ', argv, sizeof(argv) / sizeof(argv[0]))) < 3 || !argv[0]) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "-ERR INVALID ARGS!\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "-ERR INVALID ARGS!\n");
                return SWITCH_STATUS_SUCCESS;
        }
 
@@ -1605,12 +1605,12 @@ SWITCH_STANDARD_API(tone_detect_session_function)
                        if ((mto = atoi(argv[4] + 1)) > 0) {
                                to = switch_epoch_time_now(NULL) + mto;
                        } else {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID Timeout!\n");
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "INVALID Timeout!\n");
                                goto done;
                        }
                } else {
                        if ((to = atoi(argv[4])) < switch_epoch_time_now(NULL)) {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID Timeout!\n");
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "INVALID Timeout!\n");
                                to = 0;
                                goto done;
                        }
@@ -2309,7 +2309,7 @@ SWITCH_STANDARD_API(originate_function)
                }
 
                if ((extension = switch_caller_extension_new(caller_session, app_name, arg)) == 0) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n");
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Memory Error!\n");
                        abort();
                }
                switch_caller_extension_add_application(caller_session, extension, app_name, arg);
@@ -2909,7 +2909,7 @@ SWITCH_STANDARD_API(show_function)
                holder.delim = ",";
        }
 
-       /* switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SQL: %s.\n", sql); */
+       /* switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "SQL: %s.\n", sql); */
        
        if (!strcasecmp(as, "delim") || !strcasecmp(as, "csv")) {
                if (switch_strlen_zero(holder.delim)) {
@@ -3104,7 +3104,7 @@ SWITCH_STANDARD_API(uuid_setvar_function)
                                channel = switch_core_session_get_channel(psession);
 
                                if (switch_strlen_zero(var_name)) {
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No variable name specified.\n");
+                                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No variable name specified.\n");
                                        stream->write_function(stream, "-ERR No variable specified\n");
                                } else {
                                        switch_channel_set_variable(channel, var_name, var_value);
@@ -3154,7 +3154,7 @@ SWITCH_STANDARD_API(uuid_setvar_multi_function)
                                        *var_value++ = '\0';
                                }
                                if (switch_strlen_zero(var_name)) {
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No variable name specified.\n");
+                                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No variable name specified.\n");
                                        stream->write_function(stream, "-ERR No variable specified\n");
                                } else {
                                        switch_channel_set_variable(channel, var_name, var_value);
@@ -3199,7 +3199,7 @@ SWITCH_STANDARD_API(uuid_getvar_function)
 
                                if (switch_strlen_zero(var_name)) {
                                        stream->write_function(stream, "-ERR No variable name specified!\n");
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No variable name specified.\n");
+                                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No variable name specified.\n");
                                } else {
                                        var_value = switch_channel_get_variable(channel, var_name);
                                        if (var_value != NULL) {
@@ -3383,9 +3383,9 @@ SWITCH_STANDARD_API(system_function)
         return SWITCH_STATUS_SUCCESS;
     } 
 
-    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Executing command: %s\n", cmd);
+    switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Executing command: %s\n", cmd);
     if (switch_system(cmd, SWITCH_TRUE) < 0) {
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Failed to execute command: %s\n", cmd);
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Failed to execute command: %s\n", cmd);
     }
     stream->write_function(stream, "+OK\n");
     return SWITCH_STATUS_SUCCESS;
index 6513b7764c59e287086f640d34fce4c80580ab27..c051e7e95b6eea254703982b8c6e7c221b8cdd2c 100644 (file)
@@ -1639,14 +1639,14 @@ static void conference_loop_fn_transfer(conference_member_t *member, caller_cont
                        }
                        
                } else {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Empty transfer string [%s]\n", (char *) action->data);
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_ERROR, "Empty transfer string [%s]\n", (char *) action->data);
                        goto done;
                }
        } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to allocate memory to duplicate transfer data.\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_ERROR, "Unable to allocate memory to duplicate transfer data.\n");
                goto done;
        }
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Transfering to: %s, %s, %s\n", exten, dialplan, context);
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_DEBUG, "Transfering to: %s, %s, %s\n", exten, dialplan, context);
        
        switch_ivr_session_transfer(member->session,
                                                                exten, dialplan, context);
@@ -1683,19 +1683,19 @@ static void conference_loop_fn_exec_app(conference_member_t *member, caller_cont
                        }
                        
                } else {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Empty execute app string [%s]\n", (char *) action->data);
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_ERROR, "Empty execute app string [%s]\n", (char *) action->data);
                        goto done;
                }
        } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to allocate memory to duplicate execute_app data.\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_ERROR, "Unable to allocate memory to duplicate execute_app data.\n");
                goto done;
        }
 
        if (!app) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to find application.\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_ERROR, "Unable to find application.\n");
                goto done;
        }
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Execute app: %s, %s\n", app, arg);
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_DEBUG, "Execute app: %s, %s\n", app, arg);
 
        channel = switch_core_session_get_channel(member->session);
        
@@ -2001,11 +2001,11 @@ static void conference_loop_output(conference_member_t *member)
        flush_len = switch_samples_per_packet(member->conference->rate, member->conference->interval) * 10;
 
        if (switch_core_timer_init(&timer, member->conference->timer_name, interval, tsamples, NULL) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer Setup Failed.  Conference Cannot Start\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_ERROR, "Timer Setup Failed.  Conference Cannot Start\n");
                return;
        }
 
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setup timer %s success interval: %u  samples: %u\n",
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_DEBUG, "Setup timer %s success interval: %u  samples: %u\n",
                                          member->conference->timer_name, interval, tsamples);
 
        if (!restarting) {
@@ -2026,7 +2026,7 @@ static void conference_loop_output(conference_member_t *member)
                /* build a digit stream object */
                if (member->conference->dtmf_parser != NULL
                        && switch_ivr_digit_stream_new(member->conference->dtmf_parser, &member->digit_stream) != SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Danger Will Robinson, there is no digit parser stream object\n");
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_ERROR, "Danger Will Robinson, there is no digit parser stream object\n");
                }
 
                if ((call_list = switch_channel_get_private(channel, "_conference_autocall_list_"))) {
@@ -2118,12 +2118,12 @@ static void conference_loop_output(conference_member_t *member)
                if (switch_channel_test_flag(channel, CF_OUTBOUND)) {
                        /* test to see if outbound channel has answered */
                        if (switch_channel_test_flag(channel, CF_ANSWERED) && !switch_test_flag(member->conference, CFLAG_ANSWERED)) {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Outbound conference channel answered, setting CFLAG_ANSWERED\n");
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_DEBUG, "Outbound conference channel answered, setting CFLAG_ANSWERED\n");
                                switch_set_flag(member->conference, CFLAG_ANSWERED);
                        }
                } else {
                        if (switch_test_flag(member->conference, CFLAG_ANSWERED) && !switch_channel_test_flag(channel, CF_ANSWERED)) {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CLFAG_ANSWERED set, answering inbound channel\n");
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_DEBUG, "CLFAG_ANSWERED set, answering inbound channel\n");
                                switch_channel_answer(channel);
                        }
                }
@@ -2155,7 +2155,7 @@ static void conference_loop_output(conference_member_t *member)
                                param = caller_action->data;
                        }
 #ifdef INTENSE_DEBUG
-                       switch_log_printf(SWITCH_CHANNEL_LOG,
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session),
                                                          SWITCH_LOG_INFO,
                                                          "executing caller control '%s' param '%s' on call '%u, %s\n",
                                                          caller_action->fndesc->key,
@@ -2312,7 +2312,7 @@ static void conference_loop_output(conference_member_t *member)
        switch_clear_flag_locked(member, MFLAG_RUNNING);
        switch_core_timer_destroy(&timer);
 
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel leaving conference, cause: %s\n",
+       switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(channel), SWITCH_LOG_DEBUG, "Channel leaving conference, cause: %s\n",
                                          switch_channel_cause2str(switch_channel_get_cause(channel)));
 
        /* if it's an outbound channel, store the release cause in the conference struct, we might need it */
@@ -2730,13 +2730,13 @@ static switch_status_t conference_member_play_file(conference_member_t *member,
        }
        /* Setup a memory pool to use. */
        if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_CRIT, "Pool Failure\n");
                status = SWITCH_STATUS_MEMERR;
                goto done;
        }
        /* Create a node object */
        if (!(fnode = switch_core_alloc(pool, sizeof(*fnode)))) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Alloc Failure\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_CRIT, "Alloc Failure\n");
                switch_core_destroy_memory_pool(&pool);
                status = SWITCH_STATUS_MEMERR;
                goto done;
@@ -2754,7 +2754,7 @@ static switch_status_t conference_member_play_file(conference_member_t *member,
        }
        fnode->pool = pool;
        /* Queue the node */
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Queueing file '%s' for play\n", file);
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_DEBUG, "Queueing file '%s' for play\n", file);
        switch_mutex_lock(member->control_mutex);
        for (nptr = member->fnode; nptr && nptr->next; nptr = nptr->next);
        if (nptr) {
@@ -2793,13 +2793,13 @@ static switch_status_t conference_member_say(conference_member_t *member, char *
 
        /* Setup a memory pool to use. */
        if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_CRIT, "Pool Failure\n");
                return SWITCH_STATUS_MEMERR;
        }
 
        /* Create a node object */
        if (!(fnode = switch_core_alloc(pool, sizeof(*fnode)))) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Alloc Failure\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_CRIT, "Alloc Failure\n");
                switch_core_destroy_memory_pool(&pool);
                return SWITCH_STATUS_MEMERR;
        }
@@ -2813,7 +2813,7 @@ static switch_status_t conference_member_say(conference_member_t *member, char *
                if (switch_core_speech_open(&member->lsh, conference->tts_engine, conference->tts_voice,
                                                                        conference->rate, conference->interval, &flags, switch_core_session_get_pool(member->session)) !=
                        SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid TTS module [%s]!\n", conference->tts_engine);
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_ERROR, "Invalid TTS module [%s]!\n", conference->tts_engine);
                        return SWITCH_STATUS_FALSE;
                }
                member->sh = &member->lsh;
@@ -4335,7 +4335,7 @@ static switch_status_t conference_outcall(conference_obj_t *conference,
        conference_name = conference->name;
 
        if (switch_thread_rwlock_tryrdlock(conference->rwlock) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Read Lock Fail\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Read Lock Fail\n");
                return SWITCH_STATUS_FALSE;
        }
 
@@ -4354,7 +4354,7 @@ static switch_status_t conference_outcall(conference_obj_t *conference,
        /* establish an outbound call leg */
 
        if (switch_ivr_originate(session, &peer_session, cause, bridgeto, timeout, NULL, cid_name, cid_num, NULL, NULL, SOF_NONE) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot create outgoing channel, cause: %s\n", switch_channel_cause2str(*cause));
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot create outgoing channel, cause: %s\n", switch_channel_cause2str(*cause));
                if (caller_channel) {
                        switch_channel_hangup(caller_channel, *cause);
                }
@@ -4367,7 +4367,7 @@ static switch_status_t conference_outcall(conference_obj_t *conference,
 
        /* make sure the conference still exists */
        if (!switch_test_flag(conference, CFLAG_RUNNING)) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Conference is gone now, nevermind..\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Conference is gone now, nevermind..\n");
                if (caller_channel) {
                        switch_channel_hangup(caller_channel, SWITCH_CAUSE_NO_ROUTE_DESTINATION);
                }
@@ -4387,7 +4387,7 @@ static switch_status_t conference_outcall(conference_obj_t *conference,
 
                /* build an extension name object */
                if ((extension = switch_caller_extension_new(peer_session, conference_name, conference_name)) == 0) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n");
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Memory Error!\n");
                        status = SWITCH_STATUS_MEMERR;
                        goto done;
                }
@@ -4516,7 +4516,7 @@ static switch_status_t conference_outcall_bg(conference_obj_t *conference,
        switch_threadattr_detach_set(thd_attr, 1);
        switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
        switch_thread_create(&thread, thd_attr, conference_outcall_run, call, pool);
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Launching BG Thread for outcall\n");
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Launching BG Thread for outcall\n");
 
        return SWITCH_STATUS_SUCCESS;
 }
@@ -4775,12 +4775,12 @@ static int setup_media(conference_member_t *member, conference_obj_t *conference
                                                           "L16",
                                                           NULL, read_impl.actual_samples_per_second, read_impl.microseconds_per_packet / 1000,
                                                           1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, member->pool) == SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_DEBUG,
                                                  "Raw Codec Activation Success L16@%uhz 1 channel %dms\n",
                                                  read_impl.actual_samples_per_second, read_impl.microseconds_per_packet / 1000);
 
        } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16@%uhz 1 channel %dms\n",
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16@%uhz 1 channel %dms\n",
                                                  read_impl.actual_samples_per_second, read_impl.microseconds_per_packet / 1000);
 
                goto done;
@@ -4796,7 +4796,7 @@ static int setup_media(conference_member_t *member, conference_obj_t *conference
                if (switch_resample_create(&member->read_resampler,
                                                                   read_impl.actual_samples_per_second,
                                                                   conference->rate, member->frame_size, SWITCH_RESAMPLE_QUALITY, 1) != SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Unable to create resampler!\n");
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_CRIT, "Unable to create resampler!\n");
                        goto done;
                }
 
@@ -4807,7 +4807,7 @@ static int setup_media(conference_member_t *member, conference_obj_t *conference
                /* Setup an audio buffer for the resampled audio */
                if (switch_buffer_create_dynamic(&member->resample_buffer, CONF_DBLOCK_SIZE, CONF_DBUFFER_SIZE, CONF_DBUFFER_MAX)
                        != SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n");
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n");
                        goto done;
                }
        }
@@ -4820,24 +4820,24 @@ static int setup_media(conference_member_t *member, conference_obj_t *conference
                                                           conference->rate,
                                                           read_impl.microseconds_per_packet / 1000,
                                                           1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, member->pool) == SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_DEBUG,
                                                  "Raw Codec Activation Success L16@%uhz 1 channel %dms\n",
                                                  conference->rate, read_impl.microseconds_per_packet / 1000);
        } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16@%uhz 1 channel %dms\n",
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16@%uhz 1 channel %dms\n",
                                                  conference->rate, read_impl.microseconds_per_packet / 1000);
                goto codec_done2;
        }
 
        /* Setup an audio buffer for the incoming audio */
        if (switch_buffer_create_dynamic(&member->audio_buffer, CONF_DBLOCK_SIZE, CONF_DBUFFER_SIZE, CONF_DBUFFER_MAX) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n");
                goto codec_done1;
        }
 
        /* Setup an audio buffer for the outgoing audio */
        if (switch_buffer_create_dynamic(&member->mux_buffer, CONF_DBLOCK_SIZE, CONF_DBUFFER_SIZE, CONF_DBUFFER_MAX) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(member->session), SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n");
                goto codec_done1;
        }
 
@@ -4881,20 +4881,20 @@ SWITCH_STANDARD_APP(conference_function)
 
        /* Save the original read codec. */
        if (!(read_codec = switch_core_session_get_read_codec(session))) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Channel has no media!\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Channel has no media!\n");
                return;
        }
 
 
        if (switch_strlen_zero(data)) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Invalid arguments\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Invalid arguments\n");
                return;
        }
 
        mydata = switch_core_session_strdup(session, data);
 
        if (!mydata) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Pool Failure\n");
                return;
        }
 
@@ -4916,7 +4916,7 @@ SWITCH_STANDARD_APP(conference_function)
                if ((bridgeto = strchr(mydata, ':'))) {
                        *bridgeto++ = '\0';
                } else {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Config Error!\n");
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Config Error!\n");
                        goto done;
                }
        }
@@ -4955,7 +4955,7 @@ SWITCH_STANDARD_APP(conference_function)
 
        /* Open the config from the xml registry */
        if (!(cxml = switch_xml_open_cfg(global_cf_name, &cfg, params))) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", global_cf_name);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Open of %s failed\n", global_cf_name);
                goto done;
        }
 
@@ -4981,7 +4981,7 @@ SWITCH_STANDARD_APP(conference_function)
                }
 
                if ((conference = conference_find(conf_name))) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Conference %s already exists!\n", conf_name);
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Conference %s already exists!\n", conf_name);
                        goto done;
                }
 
@@ -5065,7 +5065,7 @@ SWITCH_STANDARD_APP(conference_function)
 
                /* acquire a read lock on the thread so it can't leave without us */
                if (switch_thread_rwlock_tryrdlock(conference->rwlock) != SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Read Lock Fail\n");
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Read Lock Fail\n");
                        goto done;
                }
                rl++;
@@ -5107,7 +5107,7 @@ SWITCH_STANDARD_APP(conference_function)
                                }
                                
                                if (pstatus != SWITCH_STATUS_SUCCESS && pstatus != SWITCH_STATUS_BREAK) {
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot ask the user for a pin, ending call");
+                                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Cannot ask the user for a pin, ending call");
                                        switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
                                }
 
@@ -5149,7 +5149,7 @@ SWITCH_STANDARD_APP(conference_function)
 
                /* don't allow more callers if the conference is locked, unless we invited them */
                if (switch_test_flag(conference, CFLAG_LOCKED) && enforce_security) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Conference %s is locked.\n", conf_name);
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Conference %s is locked.\n", conf_name);
                        if (conference->locked_sound) {
                                /* Answer the channel */
                                switch_channel_answer(channel);
@@ -5163,7 +5163,7 @@ SWITCH_STANDARD_APP(conference_function)
                 * max_members limit
                 */
                if ((conference->max_members > 0) && (conference->count >= conference->max_members)) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Conference %s is full.\n", conf_name);
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Conference %s is full.\n", conf_name);
                        if (conference->maxmember_sound) {
                                /* Answer the channel */
                                switch_channel_answer(channel);
index 1fa61dfbc164d9938422804630fc3641a9a2ad48..493888f59419089445d87fa971f3fea3dd38111d 100755 (executable)
@@ -307,7 +307,7 @@ SWITCH_STANDARD_APP(curl_app_function)
        switch_goto_status(SWITCH_STATUS_SUCCESS, done);
        
 usage:
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", SYNTAX);
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Usage: %s\n", SYNTAX);
        switch_goto_status(status, done);
        
 done:
index 42073552c5e0753a9df99a9668c1d0b8c56026f8..02ff01a58ccc8b9ededddb9936d6117fde092fcf 100644 (file)
@@ -125,7 +125,7 @@ SWITCH_STANDARD_APP(sched_heartbeat_function)
                }
        }
 
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", SCHED_HEARTBEAT_SYNTAX);
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Usage: %s\n", SCHED_HEARTBEAT_SYNTAX);
 
 }
 
@@ -143,7 +143,7 @@ SWITCH_STANDARD_APP(heartbeat_function)
                }
        }
 
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", HEARTBEAT_SYNTAX);
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Usage: %s\n", HEARTBEAT_SYNTAX);
 
 }
 
@@ -158,7 +158,7 @@ SWITCH_STANDARD_APP(exe_function)
                && (argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) {
                switch_core_session_execute_exten(session, argv[0], argv[1], argv[2]);
        } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", EXE_SYNTAX);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Usage: %s\n", EXE_SYNTAX);
        }
 }
 
@@ -166,7 +166,7 @@ SWITCH_STANDARD_APP(exe_function)
 SWITCH_STANDARD_APP(mkdir_function)
 {
        switch_dir_make_recursive(data, SWITCH_DEFAULT_DIR_PERMS, switch_core_session_get_pool(session));
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s MKDIR: %s\n", switch_channel_get_name(switch_core_session_get_channel(session)), data);
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s MKDIR: %s\n", switch_channel_get_name(switch_core_session_get_channel(session)), data);
 }
 
 #define SOFT_HOLD_SYNTAX "<unhold key> [<moh_a>] [<moh_b>]"
@@ -180,7 +180,7 @@ SWITCH_STANDARD_APP(soft_hold_function)
                && (argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) >= 1) {
                switch_ivr_soft_hold(session, argv[0], argv[1], argv[2]);
        } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", SOFT_HOLD_SYNTAX);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Usage: %s\n", SOFT_HOLD_SYNTAX);
        }
 }
 
@@ -220,7 +220,7 @@ SWITCH_STANDARD_APP(dtmf_bind_function)
 
                if (strchr(argv[2], 'a')) {
                        if ((bind_flags & SBF_EXEC_BLEG)) {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot bind execute to multiple legs\n");
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot bind execute to multiple legs\n");
                        } else {
                                bind_flags |= SBF_EXEC_ALEG;
                        }
@@ -228,7 +228,7 @@ SWITCH_STANDARD_APP(dtmf_bind_function)
 
                if (strchr(argv[2], 'b')) {
                        if ((bind_flags & SBF_EXEC_ALEG)) {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot bind execute to multiple legs\n");
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot bind execute to multiple legs\n");
                        } else {
                                bind_flags |= SBF_EXEC_BLEG;
                        }
@@ -236,7 +236,7 @@ SWITCH_STANDARD_APP(dtmf_bind_function)
 
                if (strchr(argv[2], 'a')) {
                        if ((bind_flags & SBF_EXEC_BLEG)) {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot bind execute to multiple legs\n");
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot bind execute to multiple legs\n");
                        } else {
                                bind_flags |= SBF_EXEC_ALEG;
                        }
@@ -244,7 +244,7 @@ SWITCH_STANDARD_APP(dtmf_bind_function)
 
                if (strchr(argv[2], 'o')) {
                        if ((bind_flags & SBF_EXEC_BLEG) || (bind_flags & SBF_EXEC_ALEG) || (bind_flags & SBF_EXEC_SAME)) {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot bind execute to multiple legs\n");
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot bind execute to multiple legs\n");
                        } else {
                                bind_flags |= SBF_EXEC_OPPOSITE;
                        }
@@ -252,7 +252,7 @@ SWITCH_STANDARD_APP(dtmf_bind_function)
 
                if (strchr(argv[2], 's')) {
                        if ((bind_flags & SBF_EXEC_BLEG) || (bind_flags & SBF_EXEC_ALEG) || (bind_flags & SBF_EXEC_SAME)) {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot bind execute to multiple legs\n");
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot bind execute to multiple legs\n");
                        } else {
                                bind_flags |= SBF_EXEC_SAME;
                        }
@@ -263,10 +263,10 @@ SWITCH_STANDARD_APP(dtmf_bind_function)
                }
                
                if (switch_ivr_bind_dtmf_meta_session(session, kval, bind_flags, argv[3]) != SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Bind Error!\n");
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Bind Error!\n");
                }
        } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", BIND_SYNTAX);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Usage: %s\n", BIND_SYNTAX);
        }
 }
 
@@ -286,7 +286,7 @@ SWITCH_STANDARD_APP(intercept_function)
                                        uuid = argv[1];
                                        bleg = SWITCH_TRUE;
                                } else {
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", INTERCEPT_SYNTAX);
+                                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Usage: %s\n", INTERCEPT_SYNTAX);
                                        return;
                                }
                        } else {
@@ -298,7 +298,7 @@ SWITCH_STANDARD_APP(intercept_function)
                return;
        }
 
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", INTERCEPT_SYNTAX);
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Usage: %s\n", INTERCEPT_SYNTAX);
 }
 
 #define MAX_SPY 3000
@@ -324,7 +324,7 @@ static int e_callback(void *pArg, int argc, char **argv, char **columnNames)
 SWITCH_STANDARD_APP(eavesdrop_function)
 {
        if (switch_strlen_zero(data)) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", eavesdrop_SYNTAX);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Usage: %s\n", eavesdrop_SYNTAX);
        } else {
                switch_channel_t *channel = switch_core_session_get_channel(session);
                const char *require_group = switch_channel_get_variable(channel, "eavesdrop_require_group");
@@ -347,7 +347,7 @@ SWITCH_STANDARD_APP(eavesdrop_function)
                                e_data.total = 0;
                                switch_core_db_exec(db, sql, e_callback, &e_data, &errmsg);
                                if (errmsg) {
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Error: %s\n", errmsg);
+                                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Error: %s\n", errmsg);
                                        switch_core_db_free(errmsg);
                                        if ((file = switch_channel_get_variable(channel, "eavesdrop_indicate_failed"))) {
                                                switch_ivr_play_file(session, NULL, file, NULL);
@@ -359,13 +359,13 @@ SWITCH_STANDARD_APP(eavesdrop_function)
                                        for (x = 0; x < e_data.total && switch_channel_ready(channel); x++) {
                                                /* If we have a group and 1000 concurrent calls, we will flood the logs. This check avoids this */
                                                if ( !require_group )
-                                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Spy: %s\n", e_data.uuid_list[x]);
+                                                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Spy: %s\n", e_data.uuid_list[x]);
                                                if ((file = switch_channel_get_variable(channel, "eavesdrop_indicate_new"))) {
                                                        switch_ivr_play_file(session, NULL, file, NULL);
                                                }
                                                if ((status = switch_ivr_eavesdrop_session(session, e_data.uuid_list[x], require_group, ED_DTMF)) != SWITCH_STATUS_SUCCESS) {
                                                        if (status != SWITCH_STATUS_BREAK) {
-                                                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Spy: %s Failed\n", e_data.uuid_list[x]);
+                                                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Spy: %s Failed\n", e_data.uuid_list[x]);
                                                                if ((file = switch_channel_get_variable(channel, "eavesdrop_indicate_failed"))) {
                                                                        switch_ivr_play_file(session, NULL, file, NULL);
                                                                }
@@ -398,7 +398,7 @@ SWITCH_STANDARD_APP(eavesdrop_function)
 SWITCH_STANDARD_APP(three_way_function)
 {
        if (switch_strlen_zero(data)) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", threeway_SYNTAX);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Usage: %s\n", threeway_SYNTAX);
        } else {
                switch_ivr_eavesdrop_session(session, data, NULL, ED_MUX_READ | ED_MUX_WRITE);
        }
@@ -461,7 +461,7 @@ SWITCH_STANDARD_APP(check_acl_function)
                                if (argc > 2) {
                                        cause = switch_channel_str2cause(argv[2]);
                                }
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Call failed acl check for ip %s on list %s\n", argv[0], argv[1]);
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Call failed acl check for ip %s on list %s\n", argv[0], argv[1]);
                                switch_channel_hangup(channel, cause);
                        }
                }
@@ -497,7 +497,7 @@ SWITCH_STANDARD_APP(transfer_function)
                                                switch_core_session_rwunlock(b_session);
                                        }
                                } else {
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "No B-leg present.\n");
+                                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "No B-leg present.\n");
                                }
                                if (both) {
                                        switch_ivr_session_transfer(session, argv[1], argv[2], argv[3]);
@@ -506,7 +506,7 @@ SWITCH_STANDARD_APP(transfer_function)
                                switch_ivr_session_transfer(session, argv[0], argv[1], argv[2]);
                        }
                } else {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No extension specified.\n");
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No extension specified.\n");
                }
        }
 }
@@ -529,7 +529,7 @@ SWITCH_STANDARD_APP(sched_transfer_function)
 
                        switch_ivr_schedule_transfer(when, switch_core_session_get_uuid(session), argv[1], argv[2], argv[3]);
                } else {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Args\n");
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid Args\n");
                }
        }
 }
@@ -562,7 +562,7 @@ SWITCH_STANDARD_APP(sched_hangup_function)
 
                        switch_ivr_schedule_hangup(when, switch_core_session_get_uuid(session), cause, bleg);
                } else {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No time specified.\n");
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No time specified.\n");
                }
        }
 }
@@ -598,7 +598,7 @@ SWITCH_STANDARD_APP(sched_broadcast_function)
 
                        switch_ivr_schedule_broadcast(when, switch_core_session_get_uuid(session), argv[1], flags);
                } else {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Args\n");
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid Args\n");
                }
        }
 }
@@ -657,12 +657,12 @@ SWITCH_STANDARD_APP(presence_function)
        switch_channel_t *channel = switch_core_session_get_channel(session);
 
        if (switch_strlen_zero(data) || !(mydata = switch_core_session_strdup(session, data))) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID ARGS!\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "INVALID ARGS!\n");
                return;
        }
 
        if ((argc = switch_separate_string(mydata, ' ', argv, sizeof(argv) / sizeof(argv[0]))) < 2) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID ARGS!\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "INVALID ARGS!\n");
                return;
        }
 
@@ -726,7 +726,7 @@ SWITCH_STANDARD_APP(set_function)
        char *var, *val = NULL;
        
        if (switch_strlen_zero(data)) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No variable name specified.\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No variable name specified.\n");
        } else {
                switch_channel_t *channel = switch_core_session_get_channel(session);
                char *expanded = NULL;
@@ -745,7 +745,7 @@ SWITCH_STANDARD_APP(set_function)
                        expanded = switch_channel_expand_variables(channel, val);
                }
 
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s SET [%s]=[%s]\n", switch_channel_get_name(channel), var, expanded ? expanded : "UNDEF");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s SET [%s]=[%s]\n", switch_channel_get_name(channel), var, expanded ? expanded : "UNDEF");
                switch_channel_set_variable_var_check(channel, var, expanded, SWITCH_FALSE);
 
                if (expanded && expanded != val) {
@@ -759,7 +759,7 @@ SWITCH_STANDARD_APP(set_global_function)
        char *var, *val = NULL;
 
        if (switch_strlen_zero(data)) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No variable name specified.\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No variable name specified.\n");
        } else {
                var = strdup(data);
                switch_assert(var);
@@ -772,7 +772,7 @@ SWITCH_STANDARD_APP(set_global_function)
                        }
                }
 
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SET GLOBAL [%s]=[%s]\n", var, val ? val : "UNDEF");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "SET GLOBAL [%s]=[%s]\n", var, val ? val : "UNDEF");
                switch_core_set_variable(var, val);
                free(var);
        }
@@ -786,7 +786,7 @@ SWITCH_STANDARD_APP(set_profile_var_function)
        caller_profile = switch_channel_get_caller_profile(switch_core_session_get_channel(session));
 
        if (switch_strlen_zero(data)) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No variable name specified.\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No variable name specified.\n");
        } else {
                name = switch_core_session_strdup(session, data);
                val = strchr(name, '=');
@@ -798,7 +798,7 @@ SWITCH_STANDARD_APP(set_profile_var_function)
                        }
                }
 
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SET_PROFILE_VAR [%s]=[%s]\n", name, val ? val : "UNDEF");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "SET_PROFILE_VAR [%s]=[%s]\n", name, val ? val : "UNDEF");
 
                if (!strcasecmp(name, "dialplan")) {
                        caller_profile->dialplan = val;
@@ -862,7 +862,7 @@ SWITCH_STANDARD_APP(export_function)
        int local = 1;
 
        if (switch_strlen_zero(data)) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No variable name specified.\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No variable name specified.\n");
        } else {
                exports = switch_channel_get_variable(channel, SWITCH_EXPORT_VARS_VARIABLE);
                var = switch_core_session_strdup(session, data);
@@ -883,7 +883,7 @@ SWITCH_STANDARD_APP(export_function)
                        }
                }
 
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "EXPORT %s[%s]=[%s]\n", local ? "" : "(REMOTE ONLY) ", var_name ? var_name : "",
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "EXPORT %s[%s]=[%s]\n", local ? "" : "(REMOTE ONLY) ", var_name ? var_name : "",
                                                  val ? val : "UNDEF");
                switch_channel_set_variable(channel, var, val);
 
@@ -905,9 +905,9 @@ SWITCH_STANDARD_APP(export_function)
 SWITCH_STANDARD_APP(unset_function)
 {
        if (switch_strlen_zero(data)) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No variable name specified.\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No variable name specified.\n");
        } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "UNSET [%s]\n", (char *) data);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "UNSET [%s]\n", (char *) data);
                switch_channel_set_variable(switch_core_session_get_channel(session), data, NULL);
        }
 }
@@ -929,7 +929,7 @@ SWITCH_STANDARD_APP(log_function)
                        ltype = SWITCH_LOG_DEBUG;
                }
 
-               switch_log_printf(SWITCH_CHANNEL_LOG, ltype, "%s\n", log_str);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), ltype, "%s\n", log_str);
                switch_safe_free(level);
        }
 }
@@ -943,7 +943,7 @@ SWITCH_STANDARD_APP(info_function)
                switch_channel_event_set_data(switch_core_session_get_channel(session), event);
                switch_event_serialize(event, &buf, SWITCH_FALSE);
                switch_assert(buf);
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "CHANNEL_DATA:\n%s\n", buf);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "CHANNEL_DATA:\n%s\n", buf);
                switch_event_destroy(&event);
                free(buf);
        }
@@ -1013,7 +1013,7 @@ SWITCH_STANDARD_APP(privacy_function)
        switch_caller_profile_t *caller_profile = switch_channel_get_caller_profile(switch_core_session_get_channel(session));
 
        if (switch_strlen_zero(data)) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No privacy mode specified.\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No privacy mode specified.\n");
        } else {
                switch_set_flag(caller_profile, SWITCH_CPF_SCREEN);
 
@@ -1030,9 +1030,9 @@ SWITCH_STANDARD_APP(privacy_function)
                        switch_clear_flag(caller_profile, SWITCH_CPF_HIDE_NAME);
                        switch_clear_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER);
                } else {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID privacy mode specified. Use a valid mode [no|yes|name|full|number].\n");
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "INVALID privacy mode specified. Use a valid mode [no|yes|name|full|number].\n");
                }
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set Privacy to %s [%d]\n", data, caller_profile->flags);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Set Privacy to %s [%d]\n", data, caller_profile->flags);
        }
 }
 
@@ -1050,7 +1050,7 @@ SWITCH_STANDARD_APP(strftime_function)
 
                switch_time_exp_lt(&tm, switch_micro_time_now());
                switch_strftime(date, &retsize, sizeof(date), argv[1], &tm);
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SET [%s]=[%s]\n", argv[0], date);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "SET [%s]=[%s]\n", argv[0], date);
                switch_channel_set_variable(switch_core_session_get_channel(session), argv[0], date);
        }
 }
@@ -1182,7 +1182,7 @@ static switch_ivr_action_t menu_handler(switch_ivr_menu_t *menu, char *param, ch
        switch_ivr_action_t action = SWITCH_IVR_ACTION_NOOP;
 
        if (param != NULL) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "menu_handler '%s'\n", param);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "menu_handler '%s'\n", param);
        }
 
        return action;
@@ -1224,15 +1224,15 @@ SWITCH_STANDARD_APP(ivr_application_function)
                                                switch_ivr_menu_execute(session, menu_stack, (char*)name, NULL);
                                                switch_ivr_menu_stack_free(menu_stack);
                                        } else {
-                                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to create menu\n");
+                                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Unable to create menu\n");
                                        }
                                } else {
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to find menu\n");
+                                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Unable to find menu\n");
                                }
                        }
                        switch_xml_free(cxml);
                } else {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", ivr_cf_name);
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Open of %s failed\n", ivr_cf_name);
                }
                switch_event_destroy(&params);
        }
@@ -1272,9 +1272,9 @@ SWITCH_STANDARD_APP(fax_detect_session_function)
 
 SWITCH_STANDARD_APP(system_session_function)
 {
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Executing command: %s\n", data);
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Executing command: %s\n", data);
        if (switch_system(data, SWITCH_TRUE) < 0) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Failed to execute command: %s\n", data);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Failed to execute command: %s\n", data);
        }
 }
 
@@ -1287,12 +1287,12 @@ SWITCH_STANDARD_APP(tone_detect_session_function)
        int hits = 1;
 
        if (switch_strlen_zero(data) || !(mydata = switch_core_session_strdup(session, data))) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID ARGS!\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "INVALID ARGS!\n");
                return;
        }
 
        if ((argc = switch_separate_string(mydata, ' ', argv, sizeof(argv) / sizeof(argv[0]))) < 2) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID ARGS!\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "INVALID ARGS!\n");
                return;
        }
 
@@ -1302,12 +1302,12 @@ SWITCH_STANDARD_APP(tone_detect_session_function)
                        if ((mto = atol(argv[3] + 1)) > 0) {
                                to = switch_epoch_time_now(NULL) + mto;
                        } else {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID Timeout!\n");
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "INVALID Timeout!\n");
                        }
                } else {
                        if ((to = atol(argv[3])) < switch_epoch_time_now(NULL)) {
                                if (to >= 1) {
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID Timeout!\n");
+                                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "INVALID Timeout!\n");
                                }
                                to = 0;
                        }
@@ -1321,14 +1321,14 @@ SWITCH_STANDARD_APP(tone_detect_session_function)
                }
        }
 
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Enabling tone detection '%s' '%s'\n", argv[0], argv[1]);
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Enabling tone detection '%s' '%s'\n", argv[0], argv[1]);
 
        switch_ivr_tone_detect_session(session, argv[0], argv[1], argv[2], to, hits, argv[4], argv[5], NULL);
 }
 
 SWITCH_STANDARD_APP(stop_fax_detect_session_function)
 {
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Disabling tone detection\n");
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Disabling tone detection\n");
        switch_ivr_stop_tone_detect_session(session);
 }
 
@@ -1386,7 +1386,7 @@ static switch_status_t on_dtmf(switch_core_session_t *session, void *input, swit
                        if (!strcasecmp(terminators, "none")) {
                                terminators = NULL;
                        }
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Digit %c\n", dtmf->digit);
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Digit %c\n", dtmf->digit);
 
                        for (p = terminators; p && *p; p++) {
                                if (*p == dtmf->digit) {
@@ -1409,7 +1409,7 @@ SWITCH_STANDARD_APP(sleep_function)
        switch_channel_t *channel = switch_core_session_get_channel(session);
 
        if (switch_strlen_zero(data)) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No timeout specified.\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No timeout specified.\n");
        } else {
                uint32_t ms = atoi(data);
                char buf[10];
@@ -1444,14 +1444,14 @@ SWITCH_STANDARD_APP(speak_function)
        switch_input_args_t args = { 0 };
 
        if (switch_strlen_zero(data) || !(mydata = switch_core_session_strdup(session, data))) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Params!\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid Params!\n");
                return;
        }
 
        argc = switch_separate_string(mydata, '|', argv, sizeof(argv) / sizeof(argv[0]));
 
        if (argc == 0) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Params!\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid Params!\n");
                return;
        } else if (argc == 1) {
                text = argv[0];
@@ -1482,7 +1482,7 @@ SWITCH_STANDARD_APP(speak_function)
                if (!text) {
                        text = "NULL";
                }
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Params! [%s][%s][%s]\n", engine, voice, text);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid Params! [%s][%s][%s]\n", engine, voice, text);
                switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
        }
 
@@ -1531,7 +1531,7 @@ static switch_status_t xfer_on_dtmf(switch_core_session_t *session, void *input,
                                }
 
                                if ((extension = switch_caller_extension_new(peer_session, app, app_arg)) == 0) {
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n");
+                                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Memory Error!\n");
                                        abort();
                                }
 
@@ -1564,7 +1564,7 @@ static switch_status_t hanguphook(switch_core_session_t *session)
                        switch_stream_handle_t stream = { 0 };
                        SWITCH_STANDARD_STREAM(stream);
                        switch_api_execute("uuid_bridge", id, NULL, &stream);
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "\nHangup Command uuid_bridge(%s):\n%s\n", id, switch_str_nil((char *) stream.data));
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "\nHangup Command uuid_bridge(%s):\n%s\n", id, switch_str_nil((char *) stream.data));
                        switch_safe_free(stream.data);
                }
 
@@ -1659,7 +1659,7 @@ SWITCH_STANDARD_APP(read_function)
        if (!switch_strlen_zero(data) && (mydata = switch_core_session_strdup(session, data))) {
                argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
        } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No arguments specified.\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No arguments specified.\n");
                return;
        }
 
@@ -1723,7 +1723,7 @@ SWITCH_STANDARD_APP(play_and_get_digits_function)
        if (!switch_strlen_zero(data) && (mydata = switch_core_session_strdup(session, data))) {
                argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
        } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No arguments specified.\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No arguments specified.\n");
                return;
        }
 
@@ -1799,7 +1799,7 @@ SWITCH_STANDARD_APP(say_function)
                
                switch_ivr_say(session, argv[3], argv[0], argv[1], argv[2], &args);
        } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", SAY_SYNTAX);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Usage: %s\n", SAY_SYNTAX);
        }
 
 }
@@ -1823,7 +1823,7 @@ SWITCH_STANDARD_APP(phrase_function)
                
                lang = switch_channel_get_variable(channel, "language");
 
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Execute %s(%s) lang %s\n", macro, switch_str_nil(mdata), switch_str_nil(lang));
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Execute %s(%s) lang %s\n", macro, switch_str_nil(mdata), switch_str_nil(lang));
 
                args.input_callback = on_dtmf;
                
@@ -1885,7 +1885,7 @@ SWITCH_STANDARD_APP(gentones_function)
        switch_channel_t *channel = switch_core_session_get_channel(session);
 
        if (switch_strlen_zero(data) || !(tone_script = switch_core_session_strdup(session, data))) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Params!\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid Params!\n");
                return;
        }
 
@@ -1950,7 +1950,7 @@ SWITCH_STANDARD_APP(record_function)
        if (!switch_strlen_zero(data) && (mydata = switch_core_session_strdup(session, data))) {
                argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
        } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No file specified.\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No file specified.\n");
                return;
        }
 
@@ -2081,7 +2081,7 @@ SWITCH_STANDARD_APP(audio_bridge_function)
                                switch_ivr_media(switch_core_session_get_uuid(session), SMF_REBRIDGE);
                                switch_channel_set_flag(caller_channel, CF_PROXY_MODE);
                        } else {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel is already up, delaying proxy mode 'till both legs are answered.\n");
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Channel is already up, delaying proxy mode 'till both legs are answered.\n");
                                switch_channel_set_variable(caller_channel, "bypass_media_after_bridge", "true");
                                switch_channel_set_variable(caller_channel, SWITCH_BYPASS_MEDIA_VARIABLE, NULL);
                                switch_channel_clear_flag(caller_channel, CF_PROXY_MODE);
@@ -2090,7 +2090,7 @@ SWITCH_STANDARD_APP(audio_bridge_function)
        }
 
        if (switch_ivr_originate(session, &peer_session, &cause, data, timelimit, NULL, NULL, NULL, NULL, NULL, SOF_NONE) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Originate Failed.  Cause: %s\n", switch_channel_cause2str(cause));
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Originate Failed.  Cause: %s\n", switch_channel_cause2str(cause));
 
                /* no answer is *always* a reason to continue */
                if (cause == SWITCH_CAUSE_NO_ANSWER || cause == SWITCH_CAUSE_NO_USER_RESPONSE || cause == SWITCH_CAUSE_ORIGINATOR_CANCEL) {
@@ -2112,12 +2112,12 @@ SWITCH_STANDARD_APP(audio_bridge_function)
                        switch_snprintf(cause_num, sizeof(cause_num), "%u", cause);
                        
                        if (failure_causes && !(switch_stristr(cause_str, failure_causes) || strstr(failure_causes, cause_num))) {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Failiure causes [%s]:  Cause: %s\n", failure_causes, cause_str);
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Failiure causes [%s]:  Cause: %s\n", failure_causes, cause_str);
                                return;
                        }
 
                        if (continue_on_fail && (switch_true(continue_on_fail) || switch_stristr(cause_str, continue_on_fail) || strstr(continue_on_fail, cause_num))) {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Continue on fail [%s]:  Cause: %s\n", continue_on_fail, cause_str);
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Continue on fail [%s]:  Cause: %s\n", continue_on_fail, cause_str);
                                return;
                        }
                }
@@ -2362,7 +2362,7 @@ static switch_call_cause_t user_outgoing_channel(switch_core_session_t *session,
        switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "as_channel", "true");
 
        if (switch_xml_locate_user("id", user, domain, NULL, &xml, &x_domain, &x_user, &x_group, params) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't find user [%s@%s]\n", user, domain);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Can't find user [%s@%s]\n", user, domain);
                cause = SWITCH_CAUSE_SUBSCRIBER_ABSENT;
                goto done;
        }
@@ -2422,7 +2422,7 @@ static switch_call_cause_t user_outgoing_channel(switch_core_session_t *session,
        }
 
        if (!dest) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No dial-string available, please check your user directory.\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No dial-string available, please check your user directory.\n");
                cause = SWITCH_CAUSE_MANDATORY_IE_MISSING;
        } else {
                const char *varval;
@@ -2477,7 +2477,7 @@ static switch_call_cause_t user_outgoing_channel(switch_core_session_t *session,
 
                switch_snprintf(stupid, sizeof(stupid), "user/%s", user);
                if (switch_stristr(stupid, d_dest)) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Waddya Daft? You almost called '%s' in an infinate loop!\n", stupid);
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Waddya Daft? You almost called '%s' in an infinate loop!\n", stupid);
                        cause = SWITCH_CAUSE_INVALID_IE_CONTENTS;
                } else if (switch_ivr_originate(session, new_session, &cause, d_dest, timelimit, NULL, 
                                                                 cid_name_override, cid_num_override, NULL, var_event, myflags) == SWITCH_STATUS_SUCCESS) {
@@ -2578,7 +2578,7 @@ SWITCH_STANDARD_APP(wait_for_silence_function)
 
        } 
        
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", WAIT_FOR_SILENCE_SYNTAX);
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Usage: %s\n", WAIT_FOR_SILENCE_SYNTAX);
 }
 
 static switch_status_t event_chat_send(const char *proto, const char *from, const char *to, const char *subject,
index 48446ff5d2fa043c031fc71a62b8c282a49babd6..79bf6a15db870f2078448c948e0e334a8d7399e7 100644 (file)
@@ -306,7 +306,7 @@ SWITCH_STANDARD_APP(easyroute_app_function)
                        }
                }
                route_lookup(destnum, &results, noat, seperator);
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "EASY ROUTE DEST: [%s]\n", results.dialstring);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "EASY ROUTE DEST: [%s]\n", results.dialstring);
                switch_channel_set_variable(channel, "easy_destnum", destnum);
                switch_channel_set_variable(channel, "easy_dialstring", results.dialstring);
                switch_channel_set_variable(channel, "easy_group", results.group);
@@ -327,7 +327,7 @@ SWITCH_STANDARD_API(easyroute_function)
        switch_status_t status = SWITCH_STATUS_SUCCESS;
        
        if (session) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "This function cannot be called from the dialplan.\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "This function cannot be called from the dialplan.\n");
                status = SWITCH_STATUS_FALSE;
                goto done;
        }
@@ -353,7 +353,7 @@ SWITCH_STANDARD_API(easyroute_function)
                } 
                if (argc == 2) {
                        if (!strcasecmp(argv[1], "noat")) {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Entering noat.\n");
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Entering noat.\n");
                                noat = 1;
                         } else if (!strcasecmp(argv[1], "seperator")) {
                                 if (argc == 3){
index e3c89c5fb114df6c9867e784e1043657d69ec2a0..51a2366ffb327c85282efe795d9fce747ee238a1 100644 (file)
@@ -124,13 +124,13 @@ SWITCH_STANDARD_APP(bcast_function)
        }
 
        if (switch_socket_create(&socket, AF_INET, SOCK_DGRAM, 0, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Socket Error 1\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Socket Error 1\n");
                goto fail;
        }
 
        if (switch_sockaddr_info_get(&control_packet_addr, mcast_ip, SWITCH_UNSPEC,
                                                                 mcast_control_port, 0, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Socket Error 3\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Socket Error 3\n");
                goto fail;
        }
 
@@ -162,9 +162,9 @@ SWITCH_STANDARD_APP(bcast_function)
                                                                           1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
                                                                           NULL, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) {
                                switch_core_session_set_read_codec(session, &codec);
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Codec Activation Success\n");
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Codec Activation Success\n");
                        } else {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec Activation Fail\n");
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Codec Activation Fail\n");
                                goto fail;
                        }
                }
@@ -178,7 +178,7 @@ SWITCH_STANDARD_APP(bcast_function)
 
 
                if (!(rtp_port = switch_rtp_request_port(esf_broadcast_ip))) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "RTP Port Error\n");
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "RTP Port Error\n");
                        goto fail;
                }
 
@@ -192,14 +192,14 @@ SWITCH_STANDARD_APP(bcast_function)
                                                                         (switch_rtp_flag_t) flags, "soft", &err, switch_core_session_get_pool(session));
 
                if (!switch_rtp_ready(rtp_session)) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "RTP Error\n");
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "RTP Error\n");
                        goto fail;
                }
        } else if (ready == SEND_TYPE_NOMEDIA) {
                switch_yield(10000);
        } else if (ready == SEND_TYPE_RAW) {
                if (switch_sockaddr_info_get(&audio_addr, mcast_ip, SWITCH_UNSPEC, mcast_port, 0, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Socket Error 2\n");
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Socket Error 2\n");
                        goto fail;
                }
        }
index 5ecc03346ecf8c0887fa016520bfc23553219cbf..c26514a104dc656250d8998243c8f922ea792888 100644 (file)
@@ -169,33 +169,33 @@ static void phase_e_handler(t30_state_t * s, void *user_data, int result)
        if (result == T30_ERR_OK) {
 
                if (pvt->app_mode == FUNCTION_TX) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Fax successfully sent.\n");
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Fax successfully sent.\n");
                } else if (pvt->app_mode == FUNCTION_RX) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Fax successfully received.\n");
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Fax successfully received.\n");
                } else {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Fax successfully managed. How ?\n");
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Fax successfully managed. How ?\n");
                }
                switch_channel_set_variable(channel, "fax_success", "1");
        } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Fax processing not successful - result (%d) %s.\n", result,
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Fax processing not successful - result (%d) %s.\n", result,
                                                  t30_completion_code_to_str(result));
                switch_channel_set_variable(channel, "fax_success", "0");
        }
 
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Remote station id: %s\n", far_ident);
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Local station id:  %s\n", local_ident);
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Pages transferred: %i\n", 
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Remote station id: %s\n", far_ident);
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Local station id:  %s\n", local_ident);
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Pages transferred: %i\n", 
                pvt->app_mode == FUNCTION_TX ? t.pages_rx : t.pages_rx);
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Total fax pages:   %i\n", t.pages_in_file);
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Image resolution:  %ix%i\n", t.x_resolution, t.y_resolution);
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Transfer Rate:     %i\n", t.bit_rate);
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Total fax pages:   %i\n", t.pages_in_file);
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Image resolution:  %ix%i\n", t.x_resolution, t.y_resolution);
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Transfer Rate:     %i\n", t.bit_rate);
 
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "ECM status         %s\n", (t.error_correcting_mode) ? "on" : "off");
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "remote country:   %s\n", switch_str_nil(t30_get_rx_country(s)));
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "remote vendor:    %s\n", switch_str_nil(t30_get_rx_vendor(s)));
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "remote model:     %s\n", switch_str_nil(t30_get_rx_model(s)));
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "ECM status         %s\n", (t.error_correcting_mode) ? "on" : "off");
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "remote country:   %s\n", switch_str_nil(t30_get_rx_country(s)));
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "remote vendor:    %s\n", switch_str_nil(t30_get_rx_vendor(s)));
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "remote model:     %s\n", switch_str_nil(t30_get_rx_model(s)));
 
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n");
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "==============================================================================\n");
 
        /*
        Set our channel variables
@@ -286,7 +286,7 @@ static switch_status_t spanfax_init(pvt_t * pvt, transport_mode_t trans_mode)
 
                memset(fax, 0, sizeof(fax_state_t));
                if (fax_init(fax, pvt->caller) == NULL) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot initialize my fax structs\n");
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot initialize my fax structs\n");
                        return SWITCH_STATUS_FALSE;
                }
 
@@ -421,7 +421,7 @@ void process_fax(switch_core_session_t *session, const char *data, application_m
        counter_increment();
 
        if (!pvt) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot allocate application private data\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot allocate application private data\n");
                return;
        } else {
                memset(pvt, 0, sizeof(pvt_t));
@@ -444,7 +444,7 @@ void process_fax(switch_core_session_t *session, const char *data, application_m
 
        buf = switch_core_session_alloc(session, SWITCH_RECOMMENDED_BUFFER_SIZE);
        if (!buf) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot allocate application buffer data\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot allocate application buffer data\n");
                return;
        }
 
@@ -515,13 +515,13 @@ void process_fax(switch_core_session_t *session, const char *data, application_m
                pvt->filename = switch_core_session_strdup(session, data);
                if (pvt->app_mode == FUNCTION_TX) {
                        if ((switch_file_exists(pvt->filename, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS)) {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot send inexistant fax file [%s]\n", switch_str_nil(pvt->filename));
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot send inexistant fax file [%s]\n", switch_str_nil(pvt->filename));
                                goto done;
                        }
                }
        } else {
                if (pvt->app_mode == FUNCTION_TX) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Fax TX filename not set.\n");
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Fax TX filename not set.\n");
                        goto done;
                } else if (pvt->app_mode == FUNCTION_RX) {
                        char *fname;
@@ -539,7 +539,7 @@ void process_fax(switch_core_session_t *session, const char *data, application_m
                                pvt->filename = switch_core_session_strdup(session, fname);
                                switch_safe_free(fname);
                        } else {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot automatically set fax RX destination file\n");
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot automatically set fax RX destination file\n");
                                goto done;
                        }
                } else {
@@ -556,7 +556,7 @@ void process_fax(switch_core_session_t *session, const char *data, application_m
        */
 
        if ((spanfax_init(pvt, AUDIO_MODE) != SWITCH_STATUS_SUCCESS)) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot initialize Fax engine\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot initialize Fax engine\n");
                return;
        }
 
@@ -588,11 +588,11 @@ void process_fax(switch_core_session_t *session, const char *data, application_m
                                                           1,
                                                           SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
                                                           NULL, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw read codec activation Success L16 %u\n",
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Raw read codec activation Success L16 %u\n",
                                                  read_codec.implementation->microseconds_per_packet);
                switch_core_session_set_read_codec(session, &read_codec);
        } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Raw read codec activation Failed L16\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Raw read codec activation Failed L16\n");
                goto done;
        }
 
@@ -604,12 +604,12 @@ void process_fax(switch_core_session_t *session, const char *data, application_m
                                                           1,
                                                           SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
                                                           NULL, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw write codec activation Success L16\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Raw write codec activation Success L16\n");
                write_frame.codec = &write_codec;
                write_frame.data = buf;
                write_frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE;
        } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Raw write codec activation Failed L16\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Raw write codec activation Failed L16\n");
                goto done;
        }
 
@@ -642,18 +642,18 @@ void process_fax(switch_core_session_t *session, const char *data, application_m
                if (!switch_test_flag(read_frame, SFF_CNG)) {
                /* pass the new incoming audio frame to the fax_rx function */
                        if (fax_rx(pvt->fax_state, (int16_t *) read_frame->data, read_frame->samples)) {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "fax_rx reported an error\n");
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "fax_rx reported an error\n");
                                goto done;
                        }
                }
 
                if ((tx = fax_tx(pvt->fax_state, buf, write_codec.implementation->samples_per_packet)) < 0) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "fax_tx reported an error\n");
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "fax_tx reported an error\n");
                        goto done;
                }
 
                if (!tx) {
-                       /* switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No audio samples to send\n"); */
+                       /* switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "No audio samples to send\n"); */
                        continue;
                } else {
                        /* Set our write_frame data */
@@ -663,7 +663,7 @@ void process_fax(switch_core_session_t *session, const char *data, application_m
 
                if (switch_core_session_write_frame(session, &write_frame, SWITCH_IO_FLAG_NONE, 0) != SWITCH_STATUS_SUCCESS) {
                        /* something weird has happened */
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR,
                                                          "Cannot write frame [datalen: %d, samples: %d]\n", write_frame.datalen, write_frame.samples);
                        goto done;
                }
index 99a415ddc3e1460b7c7b7dce348120889f9f0fde..9f570afe6f840571d3babc4cb465855072962c21 100644 (file)
@@ -717,7 +717,7 @@ SWITCH_STANDARD_APP(fifo_function)
        }
 
        if (switch_strlen_zero(data)) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Args\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No Args\n");
                return;
        }
 
@@ -731,26 +731,26 @@ SWITCH_STANDARD_APP(fifo_function)
        arg_inout = argv[1];
 
        if (!(arg_fifo_name && arg_inout)) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "USAGE %s\n", FIFO_USAGE);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "USAGE %s\n", FIFO_USAGE);
                return;
        }
 
        if (!strcasecmp(arg_inout, "out")) {
                consumer = 1;
        } else if (strcasecmp(arg_inout, "in")) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "USAGE %s\n", FIFO_USAGE);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "USAGE %s\n", FIFO_USAGE);
                return;
        }
 
        list_string = switch_core_session_strdup(session, arg_fifo_name);
 
        if (!(nlist_count = switch_separate_string(list_string, ',', nlist, (sizeof(nlist) / sizeof(nlist[0]))))) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "USAGE %s\n", FIFO_USAGE);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "USAGE %s\n", FIFO_USAGE);
                return;
        }
 
        if (!consumer && nlist_count > 1) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "USAGE %s\n", FIFO_USAGE);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "USAGE %s\n", FIFO_USAGE);
                return;
        }
 
@@ -1039,7 +1039,7 @@ SWITCH_STANDARD_APP(fifo_function)
                        } else if (!strcasecmp(strat_str, "waiting_longer")) {
                                strat = STRAT_WAITING_LONGER;
                        } else {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid strategy\n");
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid strategy\n");
                                goto done;
                        }
                }
@@ -1048,7 +1048,7 @@ SWITCH_STANDARD_APP(fifo_function)
                        if (!strcasecmp(argv[2], "nowait")) {
                                do_wait = 0;
                        } else if (strcasecmp(argv[2], "wait")) {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "USAGE %s\n", FIFO_USAGE);
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "USAGE %s\n", FIFO_USAGE);
                                goto done;
                        }
                }
@@ -1435,7 +1435,7 @@ SWITCH_STANDARD_APP(fifo_function)
 
        switch_mutex_lock(globals.mutex);
        if (node && node->ready == FIFO_DELAY_DESTROY && node->consumer_count == 0 && node->caller_count == 0) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "%s removed. (delayed)\n", node->name);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "%s removed. (delayed)\n", node->name);
                switch_core_hash_delete(globals.fifo_hash, node->name);
                switch_core_hash_destroy(&node->caller_hash);
                switch_core_hash_destroy(&node->consumer_hash);
index 704e453937b53423b6501651b0b74456ef9e018a..4318cc01d89749f94feb61703d4b48c60a4533ff 100644 (file)
@@ -113,7 +113,7 @@ SWITCH_STANDARD_APP(record_fsv_function)
        switch_channel_answer(channel);
 
        if ((fd = open((char *) data, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, S_IRUSR | S_IWUSR)) < 0) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error opening file %s\n", (char *) data);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Error opening file %s\n", (char *) data);
                return;
        }
 
@@ -126,9 +126,9 @@ SWITCH_STANDARD_APP(record_fsv_function)
                                                           read_impl.microseconds_per_packet / 1000,
                                                           1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
                                                           NULL, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Audio Codec Activation Success\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Audio Codec Activation Success\n");
        } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Audio Codec Activation Fail\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Audio Codec Activation Fail\n");
                goto end;
        }
 
@@ -234,17 +234,17 @@ SWITCH_STANDARD_APP(play_fsv_function)
        vid_buffer = switch_core_session_alloc(session, SWITCH_RECOMMENDED_BUFFER_SIZE);
 
        if ((fd = open((char *) data, O_RDONLY | O_BINARY)) < 0) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error opening file %s\n", (char *) data);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Error opening file %s\n", (char *) data);
                return;
        }
 
        if (read(fd, &h, sizeof(h)) != sizeof(h)) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error reading file header\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Error reading file header\n");
                goto end;
        }
 
        if (h.version != VERSION) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "File version does not match!\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "File version does not match!\n");
                goto end;
        }
 
@@ -267,7 +267,7 @@ SWITCH_STANDARD_APP(play_fsv_function)
 
        if (switch_core_timer_init(&timer, "soft", read_impl.microseconds_per_packet / 1000,
                                                           read_impl.samples_per_packet, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer Activation Fail\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Timer Activation Fail\n");
                goto end;
        }
 
@@ -278,9 +278,9 @@ SWITCH_STANDARD_APP(play_fsv_function)
                                                           h.audio_ptime,
                                                           1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
                                                           NULL, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Audio Codec Activation Success\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Audio Codec Activation Success\n");
        } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Audio Codec Activation Fail\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Audio Codec Activation Fail\n");
                goto end;
        }
 
@@ -291,9 +291,9 @@ SWITCH_STANDARD_APP(play_fsv_function)
                                                           0,
                                                           1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
                                                           NULL, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Video Codec Activation Success\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Video Codec Activation Success\n");
        } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Video Codec Activation Fail\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Video Codec Activation Fail\n");
                goto end;
        }
        switch_core_session_set_read_codec(session, &codec);
index 4a7db1398ac0760d8a7d6c67e24531900b813b7d..cc7af003158b8051d9655cc2fdba63127746f329 100644 (file)
@@ -187,9 +187,9 @@ static const char *do_cid(switch_memory_pool_t *pool, const char *cid, const cha
                dst = strchr(src, '/');
                *dst = '\0';
                dst++;
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "src: %s, dst: %s\n", src, dst);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "src: %s, dst: %s\n", src, dst);
        } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Not a valid regexp: %s\n", src);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Not a valid regexp: %s\n", src);
                goto done;
        }
 
@@ -212,13 +212,13 @@ static const char *do_cid(switch_memory_pool_t *pool, const char *cid, const cha
                        dst = dst_regex;
                }
                        
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "expanded src: %s, dst: %s\n", src, dst);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "expanded src: %s, dst: %s\n", src, dst);
        }
   
        if ((proceed = switch_regex_perform(number, src, &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) {
                len = (uint32_t) (strlen(src) + strlen(dst) + 10) * proceed; /* guestimate size */
                if (!(substituted = switch_core_alloc(pool, len))) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n");
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Memory Error!\n");
                        goto done;
                }
                memset(substituted, 0, len);
@@ -292,7 +292,7 @@ static char *get_bridge_data(switch_memory_pool_t *pool, char *dialed_number, ch
                                                                , cur_route->gw_prefix, cur_route->prefix
                                                                , destination_number, cur_route->suffix, cur_route->gw_suffix);
                        
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Returning Dialstring %s\n", data);
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Returning Dialstring %s\n", data);
        return data;
 }
 
@@ -492,7 +492,7 @@ static char *format_custom_sql(const char *custom_sql, callback_t *cb_struct, co
                        newSQL = switch_event_expand_headers(cb_struct->event, tmpSQL ? tmpSQL : custom_sql);
                        
                } else {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT,
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(cb_struct->session), SWITCH_LOG_CRIT,
                                                                "mod_lcr called without a valid session while using a custom_sql that has channel variables.\n");
                }
        }
@@ -698,7 +698,7 @@ static switch_status_t is_intrastatelata(callback_t *cb_struct)
                                                                cb_struct->lookup_number+1, cb_struct->lookup_number+4,
                                                                cb_struct->cid+1, cb_struct->cid+4);
 
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SQL: %s\n", sql);    
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(cb_struct->session), SWITCH_LOG_DEBUG, "SQL: %s\n", sql);    
 
        return(lcr_execute_sql_callback(sql, intrastatelata_callback, cb_struct));
        
@@ -726,7 +726,7 @@ static switch_status_t lcr_do_lookup(callback_t *cb_struct)
        
        /* allocate the dedup hash */
        if (switch_core_hash_init(&cb_struct->dedup_hash, cb_struct->pool) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error initializing the dedup hash\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(cb_struct->session), SWITCH_LOG_ERROR, "Error initializing the dedup hash\n");
                return SWITCH_STATUS_GENERR;
        }
        
@@ -744,12 +744,12 @@ static switch_status_t lcr_do_lookup(callback_t *cb_struct)
        } else {
                rate_field = switch_core_strdup(cb_struct->pool, "rate");
        }
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "intra routing [state:%d lata:%d] so rate field is [%s]\n",
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(cb_struct->session), SWITCH_LOG_DEBUG, "intra routing [state:%d lata:%d] so rate field is [%s]\n",
                                          cb_struct->intrastate, cb_struct->intralata, rate_field);
        
        /* set some channel vars if we have a session */
        if (cb_struct->session) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "we have a session\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(cb_struct->session), SWITCH_LOG_DEBUG, "we have a session\n");
                if ((channel = switch_core_session_get_channel(cb_struct->session))) {
                        switch_channel_set_variable_var_check(channel, "lcr_rate_field", rate_field, SWITCH_FALSE);
                        switch_channel_set_variable_var_check(channel, "lcr_query_digits", digits_copy, SWITCH_FALSE);
@@ -759,7 +759,7 @@ static switch_status_t lcr_do_lookup(callback_t *cb_struct)
                }
        }
        if (cb_struct->event) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "we have an event\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(cb_struct->session), SWITCH_LOG_DEBUG, "we have an event\n");
                switch_event_add_header_string(cb_struct->event, SWITCH_STACK_BOTTOM, "lcr_rate_field", rate_field);
                switch_event_add_header_string(cb_struct->event, SWITCH_STACK_BOTTOM, "lcr_query_digits", digits_copy);
                id_str = switch_core_sprintf(cb_struct->pool, "%d", cb_struct->profile->id);
@@ -782,7 +782,7 @@ static switch_status_t lcr_do_lookup(callback_t *cb_struct)
                switch_safe_free(safe_sql);
        }
        
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SQL: %s\n", (char *)sql_stream.data);    
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(cb_struct->session), SWITCH_LOG_DEBUG, "SQL: %s\n", (char *)sql_stream.data);    
        
        lookup_status = lcr_execute_sql_callback((char *)sql_stream.data, route_add_callback, cb_struct);
 
@@ -1094,22 +1094,22 @@ SWITCH_STANDARD_DIALPLAN(lcr_dialplan_hunt)
        }
        routes.pool = pool;
        if (!(routes.profile = locate_profile(lcr_profile))) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown profile: %s\n", lcr_profile);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Unknown profile: %s\n", lcr_profile);
                goto end;
        }
 
        intrastate = switch_channel_get_variable(channel, "intrastate");
        intralata = switch_channel_get_variable(channel, "intralata");
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "intrastate channel var is [%s]\n", intrastate);
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "intralata channel var is [%s]\n", intralata);
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "intrastate channel var is [%s]\n", intrastate);
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "intralata channel var is [%s]\n", intralata);
        if (!switch_strlen_zero(intralata) && !strcasecmp((char *)intralata, "true")) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Select routes based on intralata rates\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Select routes based on intralata rates\n");
                routes.intralata = SWITCH_FALSE;
        } else if (!switch_strlen_zero(intrastate) && !strcasecmp((char *)intrastate, "true")) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Select routes based on intrastate rates\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Select routes based on intrastate rates\n");
                routes.intrastate = SWITCH_TRUE;
        } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Select routes based on interstate rates\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Select routes based on interstate rates\n");
                routes.intrastate = SWITCH_FALSE;
        }
        
@@ -1117,12 +1117,12 @@ SWITCH_STANDARD_DIALPLAN(lcr_dialplan_hunt)
                caller_profile = switch_channel_get_caller_profile(channel);
        }
 
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "LCR Lookup on %s\n", caller_profile->destination_number);
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "LCR Lookup on %s\n", caller_profile->destination_number);
        routes.lookup_number = caller_profile->destination_number;
        routes.cid = (char *) caller_profile->caller_id_number;
        if (lcr_do_lookup(&routes) == SWITCH_STATUS_SUCCESS) {
                if ((extension = switch_caller_extension_new(session, caller_profile->destination_number, caller_profile->destination_number)) == 0) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "memory error!\n");
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "memory error!\n");
                        goto end;
                }
 
@@ -1134,7 +1134,7 @@ SWITCH_STANDARD_DIALPLAN(lcr_dialplan_hunt)
                        switch_caller_extension_add_application(session, extension, "bridge", cur_route->dialstring);
                }
        } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "LCR lookup failed for %s\n", caller_profile->destination_number);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "LCR lookup failed for %s\n", caller_profile->destination_number);
        }
 
 end:
@@ -1191,18 +1191,18 @@ SWITCH_STANDARD_APP(lcr_app_function)
        routes.pool = pool;
 
        intra = switch_channel_get_variable(channel, "intrastate");
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "intrastate channel var is [%s]\n", intra);
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "intrastate channel var is [%s]\n", intra);
        if (switch_strlen_zero(intra) || strcasecmp((char *)intra, "true")) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Select routes based on interstate rates\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Select routes based on interstate rates\n");
                routes.intrastate = SWITCH_FALSE;
        } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Select routes based on intrastate rates\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Select routes based on intrastate rates\n");
                routes.intrastate = SWITCH_TRUE;
        }
 
        if (!caller_profile) {
                if (!(caller_profile = switch_channel_get_caller_profile(channel))) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unable to locate caller_profile\n");
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Unable to locate caller_profile\n");
                }
        }
 
@@ -1212,7 +1212,7 @@ SWITCH_STANDARD_APP(lcr_app_function)
                        lcr_profile = argv[1];
                }
                
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "LCR Lookup on %s using profile %s\n", dest, lcr_profile);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "LCR Lookup on %s using profile %s\n", dest, lcr_profile);
                routes.lookup_number = dest;
                if (caller_profile) {
                        routes.cid = (char *) switch_channel_get_variable(channel, "effective_caller_id_number");
@@ -1222,7 +1222,7 @@ SWITCH_STANDARD_APP(lcr_app_function)
                }
        
                if (!(routes.profile = locate_profile(lcr_profile))) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown profile: %s\n", lcr_profile);
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Unknown profile: %s\n", lcr_profile);
                        goto end;
                }
                if (lcr_do_lookup(&routes) == SWITCH_STATUS_SUCCESS) {
@@ -1248,7 +1248,7 @@ SWITCH_STANDARD_APP(lcr_app_function)
                        switch_channel_set_variable(channel, "lcr_auto_route", rbuf);
                        switch_channel_set_variable(channel, "import", "lcr_carrier,lcr_rate");
                } else {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "LCR lookup failed for %s\n", dest);
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "LCR lookup failed for %s\n", dest);
                }
        }
        
@@ -1288,7 +1288,7 @@ SWITCH_STANDARD_API(dialplan_lcr_function)
                goto usage;
        }
 
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG
                                          , "data passed to lcr is [%s]\n", cmd
                                          );
 
@@ -1314,7 +1314,7 @@ SWITCH_STANDARD_API(dialplan_lcr_function)
                        int i;
                        for (i=2; i<argc; i++) {
                                if (!strcasecmp(argv[i], "intrastate")) {
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Select routes based on intrastate rates\n");
+                                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Select routes based on intrastate rates\n");
                                        cb_struct.intrastate = SWITCH_TRUE;
                                } else if(!strcasecmp(argv[i], "as")) {
                                        i++;
@@ -1324,7 +1324,7 @@ SWITCH_STANDARD_API(dialplan_lcr_function)
                                                        goto usage;
                                                }
                                } else {
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set Caller ID to [%s]\n", argv[i]);
+                                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Set Caller ID to [%s]\n", argv[i]);
                                        /* the only other option we have right now is caller id */
                                        cb_struct.cid = switch_core_strdup(pool, argv[i]);
                                }
@@ -1332,7 +1332,7 @@ SWITCH_STANDARD_API(dialplan_lcr_function)
                } 
                if (switch_strlen_zero(cb_struct.cid)) {
                        cb_struct.cid = "18005551212";
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING
                                                          , "Using default CID [%s]\n", cb_struct.cid
                                                          );
                }
index 536b2def3599406db58793a3b4be76495570b4c9..2ebd06e0544a203b1a1c11fbf139e12efb4b84cf 100644 (file)
@@ -339,7 +339,7 @@ static switch_status_t hash_state_handler(switch_core_session_t *session)
                        
                        item = (limit_hash_item_t*)val;
                        item->total_usage--;    
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Usage for %s is now %d\n", (const char*)key, item->total_usage);
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Usage for %s is now %d\n", (const char*)key, item->total_usage);
                        
                        if (item->total_usage == 0)  {
                                /* Noone is using this item anymore */
@@ -470,13 +470,13 @@ SWITCH_STANDARD_APP(db_function)
        }
 
        if (argc < 3 || !argv[0]) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "USAGE: db %s\n", DB_USAGE);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "USAGE: db %s\n", DB_USAGE);
                return;
        }
 
        if (!strcasecmp(argv[0], "insert")) {
                if (argc < 4) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "USAGE: db %s\n", DB_USAGE);
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "USAGE: db %s\n", DB_USAGE);
                        return;
                }
                sql = switch_mprintf("delete from db_data where realm='%q' and data_key='%q'", argv[1], argv[2]);
@@ -490,7 +490,7 @@ SWITCH_STANDARD_APP(db_function)
        } else if (!strcasecmp(argv[0], "delete")) {
                sql = switch_mprintf("delete from db_data where realm='%q' and data_key='%q'", argv[1], argv[2]);
        } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "USAGE: db %s\n", DB_USAGE);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "USAGE: db %s\n", DB_USAGE);
                return;
        }
 
@@ -548,7 +548,7 @@ SWITCH_STANDARD_APP(hash_function)
        goto done;
 
 usage:
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "USAGE: hash %s\n", HASH_USAGE);
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "USAGE: hash %s\n", HASH_USAGE);
 
 done:
        switch_mutex_unlock(globals.db_hash_mutex);
@@ -718,7 +718,7 @@ SWITCH_STANDARD_APP(group_function)
        }
 
        if (argc < 3 || !argv[0]) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "USAGE: group %s\n", DB_USAGE);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "USAGE: group %s\n", DB_USAGE);
                return;
        }
 
@@ -759,7 +759,7 @@ SWITCH_STANDARD_APP(limit_function)
        }
 
        if (argc < 3) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "USAGE: limit %s\n", LIMIT_USAGE);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "USAGE: limit %s\n", LIMIT_USAGE);
                return;
        }
 
@@ -914,13 +914,13 @@ static switch_bool_t do_limit_hash(switch_core_session_t *session, const char *r
                        item->rate_usage++;
 
                        if ((max >= 0) && (item->rate_usage > (uint32_t)max)) {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Usage for %s exceeds maximum rate of %d/%ds, now at %d\n", hashkey, max, interval, item->rate_usage);
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Usage for %s exceeds maximum rate of %d/%ds, now at %d\n", hashkey, max, interval, item->rate_usage);
                                status = SWITCH_FALSE;
                                goto end;
                        }
                }
        } else if ((max >= 0) && (item->total_usage + increment > (uint32_t)max)) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Usage for %s is already at max value (%d)\n", hashkey, item->total_usage);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Usage for %s is already at max value (%d)\n", hashkey, item->total_usage);
                status = SWITCH_FALSE;
                goto end;
        }
@@ -931,11 +931,11 @@ static switch_bool_t do_limit_hash(switch_core_session_t *session, const char *r
                switch_core_hash_insert(pvt->hash, hashkey, item);
 
                if (max == -1) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Usage for %s is now %d\n", hashkey, item->total_usage);
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Usage for %s is now %d\n", hashkey, item->total_usage);
                } else if (interval == 0) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Usage for %s is now %d/%d\n", hashkey, item->total_usage, max); 
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Usage for %s is now %d/%d\n", hashkey, item->total_usage, max);        
                } else {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Usage for %s is now %d/%d for the last %d seconds\n", hashkey, item->rate_usage, max, interval);
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Usage for %s is now %d/%d for the last %d seconds\n", hashkey, item->rate_usage, max, interval);
                }
 
                limit_fire_event(realm, id, item->total_usage, item->rate_usage, max, max >=0 ? (uint32_t)max : 0);
@@ -978,7 +978,7 @@ static void limit_hash_release(switch_core_session_t *session, const char *realm
        
        if ((item = (limit_hash_item_t*)switch_core_hash_find(pvt->hash, hashkey))) {
                item->total_usage--;    
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Usage for %s is now %d\n", (const char*)hashkey, item->total_usage);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Usage for %s is now %d\n", (const char*)hashkey, item->total_usage);
        
                switch_core_hash_delete(pvt->hash, hashkey);
        
@@ -1014,7 +1014,7 @@ SWITCH_STANDARD_APP(limit_hash_function)
        }
        
        if (argc < 2) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "USAGE: limit_hash %s\n", LIMITHASH_USAGE);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "USAGE: limit_hash %s\n", LIMITHASH_USAGE);
                return;
        }
        
@@ -1075,7 +1075,7 @@ SWITCH_STANDARD_APP(limit_hash_execute_function)
        }
        
        if (argc < 2) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "USAGE: limit_hash_execute %s\n", LIMITHASHEXECUTE_USAGE);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "USAGE: limit_hash_execute %s\n", LIMITHASHEXECUTE_USAGE);
                return;
        }
        
@@ -1102,7 +1102,7 @@ SWITCH_STANDARD_APP(limit_hash_execute_function)
        app_arg = argv[4];
 
        if (switch_strlen_zero(app)) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing application\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Missing application\n");
                return;
        }
 
index c5791acb040b2a87d59bdf1da01a36c5f9c7b848..849107745be657f01e85c96f6e73c2051b21ed10 100755 (executable)
@@ -173,7 +173,7 @@ SWITCH_STANDARD_API(memcache_function)
                /* clone memcached struct so we're thread safe */
                memcached = memcached_clone(NULL, globals.memcached);
                if (!memcached) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error cloning memcached object");
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Error cloning memcached object");
                        stream->write_function(stream, "-ERR Error cloning memcached object\n");
                }
                
@@ -254,14 +254,14 @@ SWITCH_STANDARD_API(memcache_function)
                                rc = memcached_add(memcached, key, strlen(key), (increment) ? svalue : "0", strlen(svalue), 0, 0);
                                if (rc == MEMCACHED_SUCCESS) {
                                        ivalue = (increment) ? offset : 0;
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Initialized inc/dec memcache key: %s to value %d\n", key, offset);
+                                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Initialized inc/dec memcache key: %s to value %d\n", key, offset);
                                } else {
                                        if (increment) {
                                                rc = memcached_increment(memcached, key, strlen(key), offset, &ivalue);
                                        } else {
                                                rc = memcached_decrement(memcached, key, strlen(key), offset, &ivalue);
                                        }
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Someone else created incr/dec memcache key, resubmitting inc/dec request.\n");
+                                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Someone else created incr/dec memcache key, resubmitting inc/dec request.\n");
                                }
                        }
                        if (rc == MEMCACHED_SUCCESS) {
@@ -336,7 +336,7 @@ SWITCH_STANDARD_API(memcache_function)
 
 mcache_error:
        if (rc != MEMCACHED_NOTFOUND) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error while running command %s: %s\n", subcmd, memcached_strerror(memcached, rc));
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Error while running command %s: %s\n", subcmd, memcached_strerror(memcached, rc));
        }
        stream->write_function(stream, "-ERR %s\n", memcached_strerror(memcached, rc));
        goto done;
index e0150a45ad91dfccad2828ab1ac9e167d06cf2ac..4d001bb25ec6a637911b2fe952c290c642da964f 100644 (file)
@@ -394,7 +394,7 @@ static switch_status_t do_billing(switch_core_session_t *session)
                return SWITCH_STATUS_SUCCESS;
        }
 
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Attempting to bill at $%s per minute to account %s\n", billrate, billaccount);
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Attempting to bill at $%s per minute to account %s\n", billrate, billaccount);
 
        /* Get caller profile info from channel */
        profile = switch_channel_get_caller_profile(channel);
@@ -405,14 +405,14 @@ static switch_status_t do_billing(switch_core_session_t *session)
        }
 
        if (profile->times->answered < 1) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Not billing %s - call is not in answered state\n", billaccount);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Not billing %s - call is not in answered state\n", billaccount);
 
                /* See if this person has enough money left to continue the call */
                balance = get_balance(billaccount);
-switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Comparing %f to hangup balance of %f\n", balance, globals.nobal_amt);
+switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Comparing %f to hangup balance of %f\n", balance, globals.nobal_amt);
                if (balance <= globals.nobal_amt) {
                        /* Not enough money - reroute call to nobal location */
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Balance of %f fell below allowed amount of %f! (Account %s)\n", balance, globals.nobal_amt, billaccount);
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Balance of %f fell below allowed amount of %f! (Account %s)\n", balance, globals.nobal_amt, billaccount);
 
                        transfer_call(session, globals.nobal_action);
                }
@@ -433,7 +433,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Comparing %f to hangup
                if (globals.mutex) {
                        switch_mutex_unlock(globals.mutex);
                }
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Received heartbeat, but we're paused - ignoring\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Received heartbeat, but we're paused - ignoring\n");
                return SWITCH_STATUS_SUCCESS;
        }
 
@@ -444,21 +444,21 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Comparing %f to hangup
 
                /* Setup new billing data (based on call answer time, in case this module started late with active calls) */
                nibble_data->lastts = profile->times->answered;         /* Set the initial answer time to match when the call was really answered */
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Beginning new billing on %s\n", uuid);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Beginning new billing on %s\n", uuid);
        } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Last successful billing time was %s\n", date);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Last successful billing time was %s\n", date);
        }
 
        switch_time_exp_lt(&tm, nibble_data->lastts);
        switch_strftime_nocheck(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm);
 
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%d seconds passed since last bill time of %s\n", (int) ((ts - nibble_data->lastts) / 1000000), date);
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%d seconds passed since last bill time of %s\n", (int) ((ts - nibble_data->lastts) / 1000000), date);
 
        if ((ts - nibble_data->lastts) >= 0) {
                /* Convert billrate into microseconds and multiply by # of microseconds that have passed since last *successful* bill */
                billamount = ((float)atof(billrate) / 1000000 / 60) * ((ts - nibble_data->lastts)) - nibble_data->bill_adjustments;
 
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Billing $%f to %s (Call: %s / %f so far)\n", billamount, billaccount, uuid, nibble_data->total);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Billing $%f to %s (Call: %s / %f so far)\n", billamount, billaccount, uuid, nibble_data->total);
 
                /* DO ODBC BILLING HERE and reset counters if it's successful! */
                if (bill_event(billamount, billaccount) == SWITCH_STATUS_SUCCESS) {
@@ -471,10 +471,10 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Comparing %f to hangup
                        /* Update channel variable with current billing */
                        switch_channel_set_variable_printf(channel, "nibble_total_billed", "%f", nibble_data->total);
                } else {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Failed to log to database!\n");
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Failed to log to database!\n");
                }
        } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Just tried to bill %s negative minutes! That should be impossible.\n", uuid);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Just tried to bill %s negative minutes! That should be impossible.\n", uuid);
        }
 
        /* Update the last time we billed */
@@ -488,7 +488,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Comparing %f to hangup
                balance = get_balance(billaccount);
                if (balance <= globals.nobal_amt) {
                        /* Not enough money - reroute call to nobal location */
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Balance of %f fell below allowed amount of %f! (Account %s)\n", balance, globals.nobal_amt, billaccount);
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Balance of %f fell below allowed amount of %f! (Account %s)\n", balance, globals.nobal_amt, billaccount);
 
                        /* IMPORTANT: Billing must be paused before the transfer occurs! This prevents infinite loops, since the transfer will result */
                        /* in nibblebill checking the call again in the routing process for an allowed balance! */
@@ -563,7 +563,7 @@ static void nibblebill_pause(switch_core_session_t *session)
        nibble_data = (nibble_data_t *) switch_channel_get_private(channel, "_nibble_data_");
 
        if (!nibble_data) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Can't pause - channel is not initialized for billing!\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Can't pause - channel is not initialized for billing!\n");
                return;
        }
 
@@ -571,7 +571,7 @@ static void nibblebill_pause(switch_core_session_t *session)
        if (nibble_data->pausets == 0)
                nibble_data->pausets = ts;
 
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Paused billing timestamp!\n");
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Paused billing timestamp!\n");
 
        /* Done checking - release lock */
        if (globals.mutex) {
@@ -594,12 +594,12 @@ static void nibblebill_resume(switch_core_session_t *session)
        nibble_data = (nibble_data_t *) switch_channel_get_private(channel, "_nibble_data_");
 
        if (!nibble_data) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Can't resume - channel is not initialized for billing (This is expected at hangup time)!\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Can't resume - channel is not initialized for billing (This is expected at hangup time)!\n");
                return;
        }
 
        if (nibble_data->pausets == 0) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Can't resume - channel is not paused! (This is expected at hangup time)\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Can't resume - channel is not paused! (This is expected at hangup time)\n");
                return;
        }
 
@@ -612,7 +612,7 @@ static void nibblebill_resume(switch_core_session_t *session)
 
        /* Calculate how much was "lost" to billings during pause - we do this here because you never know when the billrate may change during a call */
        nibble_data->bill_adjustments += ((float)atof(billrate) / 1000000 / 60) * ((ts - nibble_data->pausets));
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Resumed billing! Subtracted %f from this billing cycle.\n", (atof(billrate) / 1000000 / 60) * ((ts - nibble_data->pausets)));
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Resumed billing! Subtracted %f from this billing cycle.\n", (atof(billrate) / 1000000 / 60) * ((ts - nibble_data->pausets)));
 
        nibble_data->pausets = 0;
 
@@ -636,7 +636,7 @@ static void nibblebill_reset(switch_core_session_t *session)
        nibble_data = (nibble_data_t *) switch_channel_get_private(channel, "_nibble_data_");
 
        if (!nibble_data) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Can't reset - channel is not initialized for billing!\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Can't reset - channel is not initialized for billing!\n");
                return;
        }
 
@@ -648,7 +648,7 @@ static void nibblebill_reset(switch_core_session_t *session)
        /* Update the last time we billed */
        nibble_data->lastts = ts;
 
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Reset last billing timestamp marker to right now!\n");
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Reset last billing timestamp marker to right now!\n");
 
        /* Done checking - release lock */
        if (globals.mutex) {
@@ -670,7 +670,7 @@ static float nibblebill_check(switch_core_session_t *session)
        nibble_data = (nibble_data_t *) switch_channel_get_private(channel, "_nibble_data_");
 
        if (!nibble_data) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Can't check - channel is not initialized for billing!\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Can't check - channel is not initialized for billing!\n");
                return -99999;
        }
 
@@ -709,9 +709,9 @@ static void nibblebill_adjust(switch_core_session_t *session, float amount)
 
        /* Add or remove amount from adjusted billing here. Note, we bill the OPPOSITE */
        if (bill_event(-amount, billaccount) == SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Recorded adjustment to %s for $%f\n", billaccount, amount);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Recorded adjustment to %s for $%f\n", billaccount, amount);
        } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to record adjustment to %s for $%f\n", billaccount, amount);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Failed to record adjustment to %s for $%f\n", billaccount, amount);
        }
 }
 
@@ -733,7 +733,7 @@ SWITCH_STANDARD_APP(nibblebill_app_function)
                } else if (!strcasecmp(argv[0], "resume")) {
                        nibblebill_resume(session);
                } else if (!strcasecmp(argv[0], "check")) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Current billing is at $%f\n", nibblebill_check(session));
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Current billing is at $%f\n", nibblebill_check(session));
                } else if (!strcasecmp(argv[0], "reset")) {
                        nibblebill_reset(session);
                } else if (!strcasecmp(argv[0], "heartbeat") && argc == 2) {
@@ -768,7 +768,7 @@ SWITCH_STANDARD_API(nibblebill_api_function)
                                } else if (!strcasecmp(argv[1], "resume")) {
                                        nibblebill_resume(psession);
                                } else if (!strcasecmp(argv[1], "check")) {
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Current billing is at $%f\n", nibblebill_check(psession));
+                                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Current billing is at $%f\n", nibblebill_check(psession));
                                } else if (!strcasecmp(argv[1], "reset")) {
                                        nibblebill_reset(psession);
                                } else if (!strcasecmp(argv[1], "heartbeat") && argc == 3) {
index 9c4f6370eb9f71aaeb0b70defab63d812644797a..98a31c13949d8c5b4249cbe41df7418d3239456e 100644 (file)
@@ -194,7 +194,7 @@ SWITCH_STANDARD_APP(rss_function)
        }
 
        if (!(cxml = switch_xml_open_cfg(cf, &cfg, NULL))) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", cf);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Open of %s failed\n", cf);
                return;
        }
        switch_safe_free(chanvars);
@@ -251,20 +251,20 @@ SWITCH_STANDARD_APP(rss_function)
        }
 
        if (!feed_index) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "No Feeds Specified!\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "No Feeds Specified!\n");
                return;
        }
 
        if (switch_channel_media_ready(channel)) {
                rate = read_impl.actual_samples_per_second;
        } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Codec Error!\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Codec Error!\n");
                return;
        }
 
        memset(&sh, 0, sizeof(sh));
        if (switch_core_speech_open(&sh, engine, voice, rate, interval, &flags, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid TTS module!\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid TTS module!\n");
                return;
        }
 
@@ -275,9 +275,9 @@ SWITCH_STANDARD_APP(rss_function)
                                                           interval,
                                                           1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL,
                                                           switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activated\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Raw Codec Activated\n");
        } else {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16@%uhz 1 channel %dms\n", rate, interval);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16@%uhz 1 channel %dms\n", rate, interval);
                flags = 0;
                switch_core_speech_close(&sh, &flags);
                return;
@@ -285,13 +285,13 @@ SWITCH_STANDARD_APP(rss_function)
 
        if (timer_name) {
                if (switch_core_timer_init(&timer, timer_name, interval, (int) (rate / 50), switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Setup timer failed!\n");
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Setup timer failed!\n");
                        switch_core_codec_destroy(&speech_codec);
                        flags = 0;
                        switch_core_speech_close(&sh, &flags);
                        return;
                }
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setup timer success %u bytes per %d ms!\n", (rate / 50) * 2, interval);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Setup timer success %u bytes per %d ms!\n", (rate / 50) * 2, interval);
 
                /* start a thread to absorb incoming audio */
                switch_core_service_session(session);
@@ -388,14 +388,14 @@ SWITCH_STANDARD_APP(rss_function)
                }
 
                if (!(xml = switch_xml_parse_file(filename))) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", filename);
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Open of %s failed\n", filename);
                        goto finished;
                }
 
                err = switch_xml_error(xml);
 
                if (!switch_strlen_zero(err)) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Error [%s]\n", err);
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Error [%s]\n", err);
                        goto finished;
                }
 
index 1fbb629f8532352473b53626f2fbbc1d6776385f..ccf8134967d1632a88d372c136c6f5d14f7a4e1a 100644 (file)
@@ -146,7 +146,7 @@ static switch_status_t on_dtmf(switch_core_session_t *session, const switch_dtmf
                                break;
 
                        case '0':
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "pitch: %f tempo: %f rate: %f\n",sth->pitch,sth->tempo,sth->rate);
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "pitch: %f tempo: %f rate: %f\n",sth->pitch,sth->tempo,sth->rate);
                        }
 
                }
@@ -259,7 +259,7 @@ SWITCH_STANDARD_APP(soundtouch_start_function)
                        switch_channel_set_private(channel, "_soundtouch_", NULL);
                        switch_core_media_bug_remove(session, &bug);
                } else {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot run 2 at once on the same channel!\n");
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Cannot run 2 at once on the same channel!\n");
                }
                return;
        }
@@ -300,7 +300,7 @@ SWITCH_STANDARD_APP(soundtouch_start_function)
 
        if ((status = switch_core_media_bug_add(session, soundtouch_callback, sth, 0,
                                                                                        sth->send_not_recv ? SMBF_WRITE_REPLACE : SMBF_READ_REPLACE, &bug)) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failure!\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Failure!\n");
                return;
        }
 
index 3f041a75d978c92c3808e644d4d5ba92958b35ae..751627edc758da947c9d2fed7b5287cc71257cd9 100644 (file)
@@ -54,10 +54,10 @@ static switch_status_t spy_on_hangup(switch_core_session_t *session)
        switch_thread_rwlock_wrlock(globals.spy_hash_lock);
        
        if ((switch_core_hash_delete(globals.spy_hash,data) != SWITCH_STATUS_SUCCESS)) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,"No such key in userspy: %s \n",data);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR,"No such key in userspy: %s \n",data);
 
        } else {        
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"Userspy deactivated on %s\n",data);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,"Userspy deactivated on %s\n",data);
                globals.spy_count--;
        }
 
@@ -72,7 +72,7 @@ static switch_status_t spy_on_exchange_media(switch_core_session_t *session)
    
        if (spy_uuid) {
                if (switch_ivr_eavesdrop_session(session,spy_uuid,NULL,ED_DTMF) != SWITCH_STATUS_SUCCESS) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,"Can't eavesdrop on uuid %s\n",spy_uuid);
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR,"Can't eavesdrop on uuid %s\n",spy_uuid);
                }
        }
 
@@ -166,7 +166,7 @@ static void event_handler(switch_event_t* event)
                return;
        }
 
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"UserSpy retrieved uuid %s for key %s, activating eavesdrop \n",uuid,key);
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,"UserSpy retrieved uuid %s for key %s, activating eavesdrop \n",uuid,key);
        my_uuid = switch_event_get_header(event,"Unique-ID");
 
        session = switch_core_session_locate(uuid);
@@ -197,7 +197,7 @@ SWITCH_STANDARD_APP(userspy_function)
 
                        switch_thread_rwlock_wrlock(globals.spy_hash_lock);
                        if (switch_core_hash_find(globals.spy_hash,argv[0])) {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,"Spy already exists for %s\n",argv[0]);
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR,"Spy already exists for %s\n",argv[0]);
                                switch_channel_hangup(channel,SWITCH_CAUSE_NORMAL_CLEARING);
                                switch_thread_rwlock_unlock(globals.spy_hash_lock);
                                return;
@@ -206,7 +206,7 @@ SWITCH_STANDARD_APP(userspy_function)
                        status = switch_core_hash_insert(globals.spy_hash,argv[0],(void*) uuid);
 
                        if ((status != SWITCH_STATUS_SUCCESS)) {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,"Cant insert to spy hash\n");
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR,"Cant insert to spy hash\n");
                                switch_channel_hangup(channel,SWITCH_CAUSE_SERVICE_NOT_IMPLEMENTED);
                                switch_thread_rwlock_unlock(globals.spy_hash_lock);             
                                return;
@@ -218,7 +218,7 @@ SWITCH_STANDARD_APP(userspy_function)
                        switch_channel_set_private(channel,"_userspy_",(void*) argv[0]);
                        switch_channel_add_state_handler(channel,&spy_state_handlers);
 
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE,"UserSpy activated on %s \n",argv[0]);
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE,"UserSpy activated on %s \n",argv[0]);
 
                        if (argv[1]) {
                                switch_channel_set_variable(channel,"spy_uuid",argv[1]);
@@ -231,7 +231,7 @@ SWITCH_STANDARD_APP(userspy_function)
                }
                return;
        }
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", USERSPY_SYNTAX);
+       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Usage: %s\n", USERSPY_SYNTAX);
 }
 
 SWITCH_MODULE_LOAD_FUNCTION(mod_spy_load)
index 0d58a57482c2c6482e083f39843a6505be7909ac..a1533bf48bb0d05cb92eae3b3c4d8607a8db8b7e 100644 (file)
@@ -170,7 +170,7 @@ static switch_bool_t stress_callback(switch_media_bug_t *bug, void *user_data, s
 
             if (sth->stress) {
                 switch_event_t *event, *dup;
-                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Stress %0.2f\n", sth->stress);
+                switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(switch_core_media_bug_get_session(bug)), SWITCH_LOG_DEBUG, "Stress %0.2f\n", sth->stress);
 
                 if (switch_event_create(&event, SWITCH_EVENT_DETECTED_SPEECH) == SWITCH_STATUS_SUCCESS) {
                     switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Speech-Type", "stress-level");
@@ -180,7 +180,7 @@ static switch_bool_t stress_callback(switch_media_bug_t *bug, void *user_data, s
                         switch_event_fire(&dup);
                     }
                     if (switch_core_session_queue_event(sth->session, &event) != SWITCH_STATUS_SUCCESS) {
-                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Event queue failed!\n");
+                        switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(switch_core_media_bug_get_session(bug)), SWITCH_LOG_ERROR, "Event queue failed!\n");
                         switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "delivery-failure", "true");
                         switch_event_fire(&event);
                     }
@@ -210,7 +210,7 @@ SWITCH_STANDARD_APP(stress_start_function)
                        switch_channel_set_private(channel, "_stress_", NULL);
                        switch_core_media_bug_remove(session, &bug);
                } else {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot run 2 at once on the same channel!\n");
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Cannot run 2 at once on the same channel!\n");
                }
                return;
        }
@@ -230,7 +230,7 @@ SWITCH_STANDARD_APP(stress_start_function)
     
        if ((status = switch_core_media_bug_add(session, stress_callback, sth, 0,
                                                                                        sth->read ? SMBF_READ_REPLACE : SMBF_WRITE_REPLACE, &bug)) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failure!\n");
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Failure!\n");
                return;
        }
 
index 21f54ee9fb8c1cde6c37c7df1cc3515c7119d139..4c09319ad2cad1b00085970cd694743007a8ac13 100644 (file)
@@ -185,7 +185,7 @@ SWITCH_STANDARD_APP(t38gateway_start_function)
         }
 
         /* We have already started */
-        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot run 2 at once on the same channel!\n");
+        switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Cannot run 2 at once on the same channel!\n");
 
         return;
     }
@@ -200,7 +200,7 @@ SWITCH_STANDARD_APP(t38gateway_start_function)
     status = switch_core_media_bug_add(session, t38gateway_callback, t38gateway_info, 0, SMBF_READ_STREAM, &bug);
 
     if (status != SWITCH_STATUS_SUCCESS) {
-        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failure hooking to stream\n");
+        switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Failure hooking to stream\n");
         return;
     }
 
index 992aac16ac041955d9cec5f825f2a77a6296c347..73df85260f64ee68b2c85db70f78621ac0150744 100644 (file)
@@ -334,7 +334,7 @@ static void find_beep(vmd_session_info_t * vmd_info, switch_frame_t * frame)
             switch_core_session_queue_event(vmd_info->session, &event);
             switch_event_fire(&event_copy);
 
-            switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "<<< VMD - Beep Detected >>>\n");
+            switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(vmd_info->session), SWITCH_LOG_INFO, "<<< VMD - Beep Detected >>>\n");
             switch_channel_set_variable(channel, "vmd_detect", "TRUE");
 
             vmd_info->timestamp = 0;
@@ -559,7 +559,7 @@ SWITCH_STANDARD_APP(vmd_start_function)
         }
 
         /* We have already started */
-        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot run 2 at once on the same channel!\n");
+        switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Cannot run 2 at once on the same channel!\n");
 
         return;
     }
@@ -582,7 +582,7 @@ SWITCH_STANDARD_APP(vmd_start_function)
     status = switch_core_media_bug_add(session, vmd_callback, vmd_info, 0, SMBF_READ_REPLACE, &bug);
 
     if (status != SWITCH_STATUS_SUCCESS) {
-        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failure hooking to stream\n");
+        switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Failure hooking to stream\n");
         return;
     }
 
@@ -673,7 +673,7 @@ SWITCH_STANDARD_API(vmd_api_main)
         }
 
         /* We have already started */
-        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot run 2 at once on the same channel!\n");
+        switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Cannot run 2 at once on the same channel!\n");
 
         switch_safe_free(ccmd);
         return SWITCH_STATUS_FALSE;
@@ -711,7 +711,7 @@ SWITCH_STANDARD_API(vmd_api_main)
 
     /* If adding a media bug fails exit */
     if (status != SWITCH_STATUS_SUCCESS) {
-        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failure hooking to stream\n");
+        switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Failure hooking to stream\n");
 
         switch_safe_free(ccmd);
         return SWITCH_STATUS_FALSE;
index b7cc9554e2bf2fdeea79c515ad45323382e82ab9..6b88c5578ff92f499632bfe9635f0d2f1917dfe1 100644 (file)
@@ -1150,14 +1150,14 @@ static switch_status_t create_file(switch_core_session_t *session, vm_profile_t
 
                if (limit && (*message_len = fh.sample_count / read_impl.actual_samples_per_second) < profile->min_record_len) {
                        if (unlink(file_path) != 0) {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Failed to delete file [%s]\n", file_path);
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Failed to delete file [%s]\n", file_path);
                        }
                        got_file = 0;
                        if (exit_keys && input[0] && strchr(exit_keys, input[0])) {
                                *key_pressed = input[0];
                                return SWITCH_STATUS_SUCCESS;
                        }
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Message is less than minimum record length: %d, discarding it.\n",
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Message is less than minimum record length: %d, discarding it.\n",
                                                          profile->min_record_len);
                        if (switch_channel_ready(channel) && counter < profile->max_retries) {
                                TRY_CODE(switch_ivr_phrase_macro(session, VM_ACK_MACRO, "too-small", NULL, NULL));
@@ -1349,7 +1349,7 @@ static char *vm_merge_file(switch_core_session_t *session, vm_profile_t *profile
                                                          lfh.channels,
                                                          read_impl.actual_samples_per_second,
                                                          SWITCH_FILE_FLAG_WRITE | SWITCH_FILE_DATA_SHORT, NULL) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to open file %s\n", tmp_path);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Failed to open file %s\n", tmp_path);
                goto end;
        }
 
@@ -1361,7 +1361,7 @@ static char *vm_merge_file(switch_core_session_t *session, vm_profile_t *profile
                                                          lfh.channels,
                                                          read_impl.actual_samples_per_second,
                                                          SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to open file %s\n", announce);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Failed to open file %s\n", announce);
                goto end;
        }
 
@@ -1398,7 +1398,7 @@ static char *vm_merge_file(switch_core_session_t *session, vm_profile_t *profile
                                                          lfh.channels,
                                                          read_impl.actual_samples_per_second,
                                                          SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to open file %s\n", orig);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Failed to open file %s\n", orig);
                goto end;
        }
 
@@ -1420,7 +1420,7 @@ static char *vm_merge_file(switch_core_session_t *session, vm_profile_t *profile
        }
 
        if (unlink(announce) != 0) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Failed to delete file [%s]\n", announce);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Failed to delete file [%s]\n", announce);
        }
        ret = tmp_path;
        
@@ -1530,7 +1530,7 @@ static switch_status_t listen_file(switch_core_session_t *session, vm_profile_t
                                                switch_ivr_sleep(session, 1500, SWITCH_TRUE, NULL);
                                                forward_file_path = new_path;
                                        } else {
-                                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error merging files\n");
+                                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Error merging files\n");
                                                TRY_CODE(switch_ivr_phrase_macro(session, VM_ACK_MACRO, "deleted", NULL, NULL));
                                                goto end;
                                        }
@@ -1550,10 +1550,10 @@ static switch_status_t listen_file(switch_core_session_t *session, vm_profile_t
                                cmd = switch_core_session_sprintf(session, "%s@%s %s %s %s", vm_cc, cbt->domain, new_file_path, cbt->cid_number, cbt->cid_name);
 
                                if (voicemail_inject(cmd) == SWITCH_STATUS_SUCCESS) {
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Sent Carbon Copy to %s\n", vm_cc);
+                                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Sent Carbon Copy to %s\n", vm_cc);
                                        TRY_CODE(switch_ivr_phrase_macro(session, VM_ACK_MACRO, "saved", NULL, NULL));
                                } else {
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to Carbon Copy to %s\n", vm_cc);
+                                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Failed to Carbon Copy to %s\n", vm_cc);
                                        TRY_CODE(switch_ivr_phrase_macro(session, VM_INVALID_EXTENSION_MACRO, vm_cc, NULL, NULL));
                                        goto get_exten;
                                }
@@ -1660,7 +1660,7 @@ static switch_status_t listen_file(switch_core_session_t *session, vm_profile_t
                                        }
 
                                        switch_simple_email(cbt->email, from, header_string, body, cbt->file_path);
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending message to %s\n", cbt->email);
+                                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Sending message to %s\n", cbt->email);
                                        switch_safe_free(body);
                                        TRY_CODE(switch_ivr_phrase_macro(session, VM_ACK_MACRO, "emailed", NULL, NULL));
                                } else {
@@ -1679,7 +1679,7 @@ static switch_status_t listen_file(switch_core_session_t *session, vm_profile_t
 
        if (forward_file_path) {
                if (unlink(forward_file_path) != 0) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Failed to delete file [%s]\n", forward_file_path);
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Failed to delete file [%s]\n", forward_file_path);
                }
        }
 
@@ -2102,7 +2102,7 @@ static void voicemail_check_main(switch_core_session_t *session, vm_profile_t *p
                                        
                                        if (switch_xml_locate_user("id", myid, domain_name, switch_channel_get_variable(channel, "network_addr"),
                                                                                           &x_domain_root, &x_domain, &x_user, NULL, params) != SWITCH_STATUS_SUCCESS) {
-                                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't find user [%s@%s]\n", myid, domain_name);
+                                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Can't find user [%s@%s]\n", myid, domain_name);
                                                ok = 0;
                                        } else {
                                                myid = switch_core_session_strdup(session, switch_xml_attr(x_user, "id"));
@@ -2226,7 +2226,7 @@ static void voicemail_check_main(switch_core_session_t *session, vm_profile_t *p
                                                }
 
                                                if (switch_dir_make_recursive(dir_path, SWITCH_DEFAULT_DIR_PERMS, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
-                                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error creating %s\n", dir_path);
+                                                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Error creating %s\n", dir_path);
                                                        goto end;
                                                }
                                        }
@@ -2870,7 +2870,7 @@ static switch_status_t voicemail_leave_main(switch_core_session_t *session, vm_p
                        if (send_main && switch_strlen_zero(vm_email) && !switch_strlen_zero(email_addr)) {
                                vm_email = switch_core_session_strdup(session, email_addr);
                                if (switch_strlen_zero(vm_email)) {
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "No email address, not going to send email.\n");
+                                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "No email address, not going to send email.\n");
                                        send_main = 0;
                                }
                        }
@@ -2878,13 +2878,13 @@ static switch_status_t voicemail_leave_main(switch_core_session_t *session, vm_p
                        if (send_notify && switch_strlen_zero(vm_notify_email)) {
                                vm_notify_email = vm_email;
                                if (switch_strlen_zero(vm_notify_email)) {
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "No notify email address, not going to notify.\n");
+                                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "No notify email address, not going to notify.\n");
                                        send_notify = 0;
                                }
                        }
                        
                        if (send_mail && (!(send_main || send_notify))) {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Falling back to leaving message locally due to too many misconfiguration.\n");
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Falling back to leaving message locally due to too many misconfiguration.\n");
                                send_mail = 0;
                                insert_db = 1;
                        }
@@ -2894,7 +2894,7 @@ static switch_status_t voicemail_leave_main(switch_core_session_t *session, vm_p
                        }
                        
                } else {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't find user [%s@%s]\n", id, domain_name);
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Can't find user [%s@%s]\n", id, domain_name);
                        ok = 0;
                }
 
@@ -2916,7 +2916,7 @@ static switch_status_t voicemail_leave_main(switch_core_session_t *session, vm_p
        }
 
        if (switch_dir_make_recursive(dir_path, SWITCH_DEFAULT_DIR_PERMS, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error creating %s\n", dir_path);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Error creating %s\n", dir_path);
                goto end;
        }
 
@@ -3019,7 +3019,7 @@ static switch_status_t voicemail_leave_main(switch_core_session_t *session, vm_p
                vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &callback);
 
                if (atoi(disk_usage) >= disk_quota) {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Voicemail disk quota is exceeded for %s\n", id);
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Voicemail disk quota is exceeded for %s\n", id);
                        TRY_CODE(switch_ivr_phrase_macro(session, VM_DISK_QUOTA_EXCEEDED_MACRO, NULL, NULL, NULL));
                        goto end;
                }
@@ -3087,13 +3087,13 @@ static switch_status_t voicemail_leave_main(switch_core_session_t *session, vm_p
                        if ((vm_cc = switch_channel_get_variable(channel, "vm_cc"))) {
                                char *cmd = switch_core_session_sprintf(session, "%s %s %s %s", vm_cc, file_path, caller_id_number, caller_id_name);
                                if (voicemail_inject(cmd) == SWITCH_STATUS_SUCCESS) {
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Sent Carbon Copy to %s\n", vm_cc);
+                                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Sent Carbon Copy to %s\n", vm_cc);
                                } else {
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to Carbon Copy to %s\n", vm_cc);
+                                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Failed to Carbon Copy to %s\n", vm_cc);
                                }
                        }
                } else {
-                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to deliver message\n");
+                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Failed to deliver message\n");
                        TRY_CODE(switch_ivr_phrase_macro(session, VM_ACK_MACRO, "deleted", NULL, NULL));
                }
 
@@ -3178,12 +3178,12 @@ SWITCH_STANDARD_APP(voicemail_function)
        }
 
        if (switch_strlen_zero(profile_name) || switch_strlen_zero(domain_name)) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Usage: %s\n", VM_USAGE);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Error Usage: %s\n", VM_USAGE);
                return;
        }
 
        if (!(profile = get_profile(profile_name))) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error invalid profile %s\n", profile_name);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Error invalid profile %s\n", profile_name);
                return;
        }
 
index 70fea54056e101c2902ea806fe9b7c53e855625b..8380adb7c32c1dd170e70d07c907979b51305900 100644 (file)
@@ -1078,7 +1078,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_perform_kill_channel(switch_
        switch_io_event_hook_kill_channel_t *ptr;
        switch_status_t status = SWITCH_STATUS_FALSE;
 
-       switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_DEBUG, "Send signal %s [%s]\n", switch_channel_get_name(session->channel),
+       switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_core_session_get_uuid(session), SWITCH_LOG_DEBUG, "Send signal %s [%s]\n", switch_channel_get_name(session->channel),
                                          SIG_NAMES[sig]);
 
        if (session->endpoint_interface->io_routines->kill_channel) {
index 177abc1dca167dea90478889a3cf91827758948f..a255469a8d22c1bf5f05b9d168376e2211c11918 100644 (file)
@@ -80,7 +80,7 @@ SWITCH_DECLARE(void *) switch_core_perform_session_alloc(switch_core_session_t *
 
 #ifdef DEBUG_ALLOC
        if (memory > 500)
-               switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_CONSOLE, "Session Allocate %d\n", (int) memory);
+               switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_core_session_get_uuid(session), SWITCH_LOG_CONSOLE, "Session Allocate %d\n", (int) memory);
 #endif
 
        ptr = apr_palloc(session->pool, memory);
@@ -250,7 +250,7 @@ SWITCH_DECLARE(char *) switch_core_perform_session_strdup(switch_core_session_t
 #ifdef DEBUG_ALLOC
        len = strlen(todup);
        if (len > 500)
-               switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_CONSOLE, "Sess Strdup Allocate %d\n", (int) len);
+               switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_core_session_get_uuid(session), SWITCH_LOG_CONSOLE, "Sess Strdup Allocate %d\n", (int) len);
 #endif
 
        duped = apr_pstrdup(session->pool, todup);