Author: james Date: Fri Apr 14 11:28:04 2006 New Revision: 1155 Added: freeswitch/branches/james/src/mod/loggers/mod_syslog/ freeswitch/branches/james/src/mod/loggers/mod_syslog/mod_syslog.c Modified: freeswitch/branches/james/conf/freeswitch.conf freeswitch/branches/james/src/include/switch_utils.h freeswitch/branches/james/src/switch_utils.c Log: Added syslog support, still need work on the separate levels. Modified: freeswitch/branches/james/conf/freeswitch.conf ============================================================================== --- freeswitch/branches/james/conf/freeswitch.conf (original) +++ freeswitch/branches/james/conf/freeswitch.conf Fri Apr 14 11:28:04 2006 @@ -18,6 +18,7 @@ ; Loggers (I'd load these first) load => mod_console +load => mod_syslog ; Event Handlers ;load => mod_event_multicast @@ -67,6 +68,23 @@ ; ASR /TTS ;load => mod_cepstral +;---- SYSLOG +;-------------------------------------------------------------------------------- +; emerg - system is unusable +; alert - action must be taken immediately +; crit - critical conditions +; err - error conditions +; warning - warning conditions +; notice - normal, but significant, condition +; info - informational message +; debug - debug-level message +; +[+syslog.conf] +[settings] +ident => freeswitch +facility => user +format => ${time} - ${message} +level => debug,info,warning-alert ;---- IAX PROTOCOL Modified: freeswitch/branches/james/src/include/switch_utils.h ============================================================================== --- freeswitch/branches/james/src/include/switch_utils.h (original) +++ freeswitch/branches/james/src/include/switch_utils.h Fri Apr 14 11:28:04 2006 @@ -174,6 +174,8 @@ */ SWITCH_DECLARE(char *) switch_cut_path(char *in); +SWITCH_DECLARE(char *) switch_string_replace(const char *string, const char *search, const char *replace); +SWITCH_DECLARE(switch_status) switch_string_match(const char *string, int string_len, const char *search, int search_len); #ifdef __cplusplus } Added: freeswitch/branches/james/src/mod/loggers/mod_syslog/mod_syslog.c ============================================================================== --- (empty file) +++ freeswitch/branches/james/src/mod/loggers/mod_syslog/mod_syslog.c Fri Apr 14 11:28:04 2006 @@ -0,0 +1,167 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, James Martelletti <james@nerdc0re.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * James Martelletti <james@nerdc0re.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * James Martelletti <james@nerdc0re.com> + * + * + * mod_syslog.c -- System Logging + * + */ +#include <switch.h> +#include <stdlib.h> +#include <syslog.h> + +#define DEFAULT_IDENT "freeswitch" +#define DEFAULT_FACILITY "user" +#define DEFAULT_LEVEL "warning" +#define DEFAULT_FORMAT "[message]" +#define MAX_LENGTH 1024 + +static const char modname[] = "mod_syslog"; +static switch_status load_config(void); + +static struct { + char *ident; + char *facility; + char *level; + char *format; +} globals; + +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_ident, globals.ident) +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_level, globals.level) +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_format, globals.format) +SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_facility, globals.facility) + +static switch_loadable_module_interface console_module_interface = { + /*.module_name */ modname, + /*.endpoint_interface */ NULL, + /*.timer_interface */ NULL, + /*.dialplan_interface */ NULL, + /*.codec_interface */ NULL, + /*.application_interface */ NULL, + /*.api_interface */ NULL, + /*.file_interface */ NULL, + /*.speech_interface */ NULL, + /*.directory_interface */ NULL +}; + +static switch_status mod_syslog_logger(const switch_log_node *node, switch_log_level level) +{ + char *message = NULL; + char line_no[sizeof(int)*8+1]; + char date[80] = ""; + switch_time_exp_t time; + switch_size_t retsize; + + message = (char *)malloc(strlen(globals.format)+2); + + switch_copy_string(message, globals.format, strlen(globals.format)+1); + + message = switch_string_replace(message, "${message}", node->content); + + if (switch_time_exp_lt(&time, node->timestamp) != SWITCH_STATUS_SUCCESS) { + return SWITCH_STATUS_FALSE; + } + + switch_strftime(date, &retsize, sizeof(date), "%Y-%m-%d %T", &time); + message = switch_string_replace(message, "${time}", date); + + message = switch_string_replace(message, "${file}", node->file); + message = switch_string_replace(message, "${func}", node->func); + + snprintf(line_no, sizeof(line_no), "%d", node->line); + message = switch_string_replace(message, "${line}", line_no); + + if (!switch_strlen_zero(message)) { + syslog(LOG_ERR, "%s", message); + } + + free(message); + + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename) +{ + *interface = &console_module_interface; + + switch_log_bind_logger(mod_syslog_logger, SWITCH_LOG_DEBUG); + + load_config(); + + openlog(globals.ident, LOG_PID, LOG_USER); + + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_MOD_DECLARE(switch_status) switch_module_unload(const switch_loadable_module_interface **interface) +{ + closelog(); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status load_config(void) +{ + switch_config cfg; + char *var, *val; + char *cf = "syslog.conf"; + + if (!switch_config_open_file(&cfg, cf)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "open of %s failed\n", cf); + return SWITCH_STATUS_TERM; + } + + while (switch_config_next_pair(&cfg, &var, &val)) { + if (!strcasecmp(cfg.category, "settings")) { + if (!strcmp(var, "ident")) { + set_global_ident(val); + } else if (!strcmp(var, "facility")) { + set_global_facility(val); + } else if (!strcmp(var, "format")) { + set_global_format(val); + } else if (!strcmp(var, "level")) { + set_global_level(val);; + } + } + } + + switch_config_close_file(&cfg); + + if (switch_strlen_zero(globals.ident)) { + set_global_ident(DEFAULT_IDENT); + } + if (switch_strlen_zero(globals.facility)) { + set_global_facility(DEFAULT_FACILITY); + } + if (switch_strlen_zero(globals.format)) { + set_global_format(DEFAULT_FORMAT); + } + if (switch_strlen_zero(globals.level)) { + set_global_level(DEFAULT_LEVEL); + } + + return SWITCH_STATUS_SUCCESS; +} Modified: freeswitch/branches/james/src/switch_utils.c ============================================================================== --- freeswitch/branches/james/src/switch_utils.c (original) +++ freeswitch/branches/james/src/switch_utils.c Fri Apr 14 11:28:04 2006 @@ -30,6 +30,9 @@ * */ #include <switch.h> +#include <stdio.h> +#include <string.h> +#include <stdlib.h> SWITCH_DECLARE(char *) switch_priority_name(switch_priority_t priority) { @@ -141,6 +144,52 @@ return SWITCH_STATUS_SUCCESS; } +SWITCH_DECLARE(switch_status) switch_string_match(const char *string, int string_len, const char *search, int search_len) +{ + int i; + + for (i = 0; (i < search_len) && (i < string_len); i++) { + if (string[i] != search[i]) { + return SWITCH_STATUS_FALSE; + } + } + + if (i == search_len) { + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_FALSE; +} + +SWITCH_DECLARE(char *) switch_string_replace(const char *string, const char *search, const char *replace) +{ + int string_len = strlen(string); + int search_len = strlen(search); + int replace_len = strlen(replace); + int i, n; + int dest_len = 0; + char *dest; + + dest = (char *)malloc(sizeof(char)); + + for (i = 0; i < string_len; i++) { + if (switch_string_match(string + i, string_len - i, search, search_len) == SWITCH_STATUS_SUCCESS) { + for (n = 0; n < replace_len; n++) { + dest[dest_len] = replace[n]; + dest_len++; + dest = (char *)realloc(dest, sizeof(char)*(dest_len+1)); + } + i += search_len-1; + } else { + dest[dest_len] = string[i]; + dest_len++; + dest = (char *)realloc(dest, sizeof(char)*(dest_len+1)); + } + } + + dest[dest_len] = 0; + return dest; +} SWITCH_DECLARE(int) switch_socket_waitfor(switch_pollfd_t *poll, int ms) {