mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-04-28 05:04:13 +00:00
make mailer app name a config option
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6163 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
8ed43c00f0
commit
23aa165dff
@ -8,6 +8,8 @@
|
|||||||
<param name="loglevel" value="debug"/>
|
<param name="loglevel" value="debug"/>
|
||||||
<!--Try to catch any crashes that can be recoverable (in the context of a call)-->
|
<!--Try to catch any crashes that can be recoverable (in the context of a call)-->
|
||||||
<param name="crash-protection" value="false"/>
|
<param name="crash-protection" value="false"/>
|
||||||
|
<param name="mailer-app" value="sendmail"/>
|
||||||
|
<param name="mailer-app-args" value="-t"/>
|
||||||
<!--RTP port range -->
|
<!--RTP port range -->
|
||||||
<!--<param name="rtp-start-port" value="16384"/>-->
|
<!--<param name="rtp-start-port" value="16384"/>-->
|
||||||
<!--<param name="rtp-end-port" value="32768"/>-->
|
<!--<param name="rtp-end-port" value="32768"/>-->
|
||||||
|
@ -171,6 +171,8 @@ struct switch_runtime {
|
|||||||
int32_t sps;
|
int32_t sps;
|
||||||
int32_t sps_last;
|
int32_t sps_last;
|
||||||
switch_log_level_t hard_log_level;
|
switch_log_level_t hard_log_level;
|
||||||
|
char *mailer_app;
|
||||||
|
char *mailer_app_args;
|
||||||
};
|
};
|
||||||
|
|
||||||
extern struct switch_runtime runtime;
|
extern struct switch_runtime runtime;
|
||||||
|
@ -542,6 +542,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(const char *console, switch_cor
|
|||||||
|
|
||||||
switch_set_flag((&runtime), SCF_NO_NEW_SESSIONS);
|
switch_set_flag((&runtime), SCF_NO_NEW_SESSIONS);
|
||||||
runtime.hard_log_level = SWITCH_LOG_DEBUG;
|
runtime.hard_log_level = SWITCH_LOG_DEBUG;
|
||||||
|
runtime.mailer_app = "sendmail";
|
||||||
|
runtime.mailer_app_args = "-t";
|
||||||
|
|
||||||
/* INIT APR and Create the pool context */
|
/* INIT APR and Create the pool context */
|
||||||
if (apr_initialize() != SWITCH_STATUS_SUCCESS) {
|
if (apr_initialize() != SWITCH_STATUS_SUCCESS) {
|
||||||
@ -595,6 +597,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(const char *console, switch_cor
|
|||||||
|
|
||||||
switch_core_session_ctl(SCSC_LOGLEVEL, &level);
|
switch_core_session_ctl(SCSC_LOGLEVEL, &level);
|
||||||
|
|
||||||
|
} else if (!strcasecmp(var, "mailer-app")) {
|
||||||
|
runtime.mailer_app = switch_core_strdup(runtime.memory_pool, val);
|
||||||
|
} else if (!strcasecmp(var, "mailer-app-args")) {
|
||||||
|
runtime.mailer_app_args = switch_core_strdup(runtime.memory_pool, val);
|
||||||
} else if (!strcasecmp(var, "sessions-per-second")) {
|
} else if (!strcasecmp(var, "sessions-per-second")) {
|
||||||
switch_core_sessions_per_second(atoi(val));
|
switch_core_sessions_per_second(atoi(val));
|
||||||
} else if (!strcasecmp(var, "max-sessions")) {
|
} else if (!strcasecmp(var, "max-sessions")) {
|
||||||
|
@ -33,6 +33,7 @@
|
|||||||
#ifndef WIN32
|
#ifndef WIN32
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
#endif
|
#endif
|
||||||
|
#include "private/switch_core_pvt.h"
|
||||||
|
|
||||||
static const char switch_b64_table[65] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
static const char switch_b64_table[65] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
||||||
#define B64BUFFLEN 1024
|
#define B64BUFFLEN 1024
|
||||||
@ -179,7 +180,7 @@ SWITCH_DECLARE(switch_bool_t) switch_simple_email(char *to, char *from, char *he
|
|||||||
if (ifd) {
|
if (ifd) {
|
||||||
close(ifd);
|
close(ifd);
|
||||||
}
|
}
|
||||||
snprintf(buf, B64BUFFLEN, "/bin/cat %s | /usr/sbin/sendmail -tf \"%s\" %s", filename, from, to);
|
snprintf(buf, B64BUFFLEN, "/bin/cat %s | %s %s", filename, runtime.mailer_app, runtime.mailer_app_args);
|
||||||
if(system(buf)) {
|
if(system(buf)) {
|
||||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to execute command: %s\n", buf);
|
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to execute command: %s\n", buf);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user