]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
update logger stuff
authorAnthony Minessale <anthony.minessale@gmail.com>
Tue, 4 Dec 2007 23:47:27 +0000 (23:47 +0000)
committerAnthony Minessale <anthony.minessale@gmail.com>
Tue, 4 Dec 2007 23:47:27 +0000 (23:47 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6510 d0543943-73ff-0310-b7d9-9358b9ac24b2

conf/autoload_configs/logfile.conf.xml
src/mod/loggers/mod_logfile/mod_logfile.c
src/switch.c

index fe71ebef1ac93ebf66173bd53382e96d54da214f..6f2aa8033a4e3787e0d2806db118664b9221c645 100644 (file)
@@ -2,7 +2,9 @@
   <settings>
    <!-- File to log to -->
    <!--<param name="logfile" value="/var/log/freeswitch.log"/>-->
-   <!-- At this length in bytes rotate the log file -->
+   <!-- true to auto rotate on HUP, false to open/close -->
+   <param name="rotate" value="true"/>
+   <!-- At this length in bytes rotate the log file (0 for never) -->
    <!--<param name="rollover" value="10485760"/>-->
    <!-- The level of the message to log -->
    <!--<param name="level" value="debug,info,warning,notice,error,crit,alert"/>-->
index fc96fdb3c3d6260e1e5d81d61ce45720fb2c765b..afce7838b40250544d4d56b4deedb7a342498deb 100644 (file)
-/* \r
- * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application\r
- *\r
- * Version: MPL 1.1\r
- *\r
- * The contents of this file are subject to the Mozilla Public License Version\r
- * 1.1 (the "License"); you may not use this file except in compliance with\r
- * the License. You may obtain a copy of the License at\r
- * http://www.mozilla.org/MPL/\r
- *\r
- * Software distributed under the License is distributed on an "AS IS" basis,\r
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License\r
- * for the specific language governing rights and limitations under the\r
- * License.\r
- *\r
- * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application\r
- *\r
- * The Initial Developer of the Original Code is\r
- * Anthony Minessale II <anthmct@yahoo.com>\r
- * Portions created by the Initial Developer are Copyright (C)\r
- * the Initial Developer. All Rights Reserved.\r
- *\r
- * Contributor(s):\r
- * \r
- * Anthony LaMantia <anthony@petabit.net>\r
- * Michael Jerris <mike@jerris.com>\r
- *\r
- *\r
- * mod_logfile.c -- Filesystem Logging\r
- *\r
- */\r
-\r
-#include <switch.h>\r
-\r
-SWITCH_MODULE_LOAD_FUNCTION(mod_logfile_load);\r
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_logfile_shutdown);\r
-SWITCH_MODULE_DEFINITION(mod_logfile, mod_logfile_load, mod_logfile_shutdown, NULL);\r
-\r
-#define DEFAULT_LIMIT    0xA00000 /* About 10 MB */\r
-#define WARM_FUZZY_OFFSET 256\r
-#define MAX_ROT 4096 /* why not */\r
-static const uint8_t STATIC_LEVELS[] = {0, 1, 2, 3, 4, 5, 6, 7, 8};\r
-\r
-static switch_status_t load_config(void);\r
-static switch_memory_pool_t *module_pool = NULL;\r
-\r
-static struct {\r
-       unsigned int log_fd;\r
-       switch_size_t log_size;   /* keep the log size in check for rotation */\r
-       switch_size_t roll_size;  /* the size that we want to rotate the file at */\r
-       char *logfile;\r
-       switch_file_t    *log_afd;\r
-} globals;\r
-\r
-SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_logfile, globals.logfile);\r
-\r
-/* i know this is strange but it's the fastest way i could think of managing log levels. */\r
-/* i'd rather not try to search something each time we get a message to log */\r
-struct level_set {\r
-       int level;\r
-       int on;\r
-} static levels[] = {\r
-       {SWITCH_LOG_CONSOLE, 0},   /* 0 */\r
-       {SWITCH_LOG_ALERT,   0},   /* 1 */\r
-       {SWITCH_LOG_CRIT,    0},   /* 2 */\r
-       {SWITCH_LOG_ERROR,   0},   /* 3 */\r
-       {SWITCH_LOG_WARNING, 0},   /* 4 */\r
-       {SWITCH_LOG_NOTICE,  0},   /* 5 */\r
-       {SWITCH_LOG_INFO,    0},   /* 6 */\r
-       {SWITCH_LOG_DEBUG,   0},   /* 7 */\r
-};\r
-\r
-void process_levels(char *p)\r
-{\r
-       int x, argc = 0;\r
-       char *argv[10] = { 0 };\r
-\r
-       if ((argc = switch_separate_string(p, ',', argv, (sizeof(argv) / sizeof(argv[0]))))) {\r
-               for (x = 0; x < argc; x++) {\r
-                       if (!strncasecmp(argv[x], "alert", strlen(argv[x]))) {\r
-                               levels[SWITCH_LOG_ALERT].on = 1;\r
-                       } else if (!strncasecmp(argv[x], "crit", strlen(argv[x]))) {\r
-                               levels[SWITCH_LOG_CRIT].on = 1;\r
-                       } else if (!strncasecmp(argv[x], "error", strlen(argv[x]))) {\r
-                               levels[SWITCH_LOG_ERROR].on = 1;\r
-                       } else if (!strncasecmp(argv[x], "warn", strlen(argv[x]))) {\r
-                               levels[SWITCH_LOG_WARNING].on = 1;\r
-                       } else if (!strncasecmp(argv[x], "notice", strlen(argv[x]))) {\r
-                               levels[SWITCH_LOG_NOTICE].on = 1;\r
-                       } else if (!strncasecmp(argv[x], "info", strlen(argv[x]))) {\r
-                               levels[SWITCH_LOG_INFO].on = 1;\r
-                       } else if (!strncasecmp(argv[x], "debug", strlen(argv[x]))) {\r
-                               levels[SWITCH_LOG_DEBUG].on = 1;\r
-                       } else if (!strncasecmp(argv[x], "console", strlen(argv[x]))) {\r
-                               levels[SWITCH_LOG_CONSOLE].on = 1;\r
-                       } else if (!strncasecmp(argv[x], "all", strlen(argv[x]))) {\r
-                               int i;\r
-                               for (i=0; i < (sizeof(levels) / sizeof(struct level_set)); i++) {\r
-                                       levels[i].on = 1;\r
-                               }\r
-                       }\r
-               }\r
-       }\r
-       return;\r
-}\r
-\r
-static switch_status_t mod_logfile_rotate(void);\r
-\r
-static switch_status_t mod_logfile_openlogfile(switch_bool_t check)\r
-{\r
-       unsigned int flags = 0;\r
-       switch_file_t *afd;\r
-       switch_status_t stat;\r
-\r
-       flags |= SWITCH_FOPEN_CREATE;\r
-       flags |= SWITCH_FOPEN_READ;\r
-       flags |= SWITCH_FOPEN_WRITE;\r
-       flags |= SWITCH_FOPEN_APPEND;\r
-\r
-       stat = switch_file_open(&afd, globals.logfile, flags, SWITCH_FPROT_UREAD|SWITCH_FPROT_UWRITE, module_pool);\r
-       if (stat != SWITCH_STATUS_SUCCESS) {\r
-               return SWITCH_STATUS_FALSE;\r
-       }\r
-\r
-       globals.log_afd = afd;\r
-\r
-       globals.log_size = switch_file_get_size(globals.log_afd);\r
-\r
-       if (check && globals.log_size >= globals.roll_size) {\r
-               mod_logfile_rotate();\r
-       }\r
-\r
-       return SWITCH_STATUS_SUCCESS;\r
-}\r
-\r
-/* rotate the log file */\r
-static switch_status_t mod_logfile_rotate(void)\r
-{\r
-       unsigned int i = 0;\r
-       char *p = NULL;\r
-       switch_status_t stat = 0;\r
-       int64_t offset = 0;\r
-    switch_memory_pool_t *pool;\r
-    switch_time_exp_t tm;\r
-    char date[80] = "";\r
-    switch_size_t retsize;\r
-\r
-    switch_time_exp_lt(&tm, switch_time_now());\r
-    switch_strftime(date, &retsize, sizeof(date), "%Y-%m-%d-%H-%M-%S", &tm);\r
-\r
-       globals.log_size = 0;\r
-\r
-       stat = switch_file_seek(globals.log_afd, SWITCH_SEEK_SET, &offset);\r
-\r
-       if (stat != SWITCH_STATUS_SUCCESS)\r
-               return SWITCH_STATUS_FALSE;\r
-\r
-       p = malloc(strlen(globals.logfile)+WARM_FUZZY_OFFSET);\r
-    assert(p);\r
-\r
-       memset(p, '\0', strlen(globals.logfile)+WARM_FUZZY_OFFSET);\r
-\r
-    switch_core_new_memory_pool(&pool);\r
-    \r
-       for (i=1; i < MAX_ROT; i++) {\r
-               sprintf((char *)p, "%s.%s.%i", globals.logfile, date, i);\r
-        if (switch_file_exists(p, pool) == SWITCH_STATUS_SUCCESS) {\r
-            continue;\r
-        }\r
-        \r
-        switch_file_close(globals.log_afd);\r
-        switch_file_rename(globals.logfile, p, pool);\r
-        mod_logfile_openlogfile(SWITCH_FALSE);\r
-        break;\r
-       }\r
-\r
-       free(p);\r
-\r
-    switch_core_destroy_memory_pool(&pool);\r
-\r
-       return SWITCH_STATUS_SUCCESS;\r
-}\r
-\r
-/* write to the actual logfile */\r
-static switch_status_t mod_logfile_raw_write(char *log_data) \r
-{\r
-       switch_size_t len;\r
-       len = strlen(log_data);\r
-\r
-       if (len <= 0)\r
-               return SWITCH_STATUS_FALSE;\r
-\r
-       if (switch_file_write(globals.log_afd, log_data, &len) != SWITCH_STATUS_SUCCESS) {\r
-        switch_file_close(globals.log_afd);\r
-        mod_logfile_openlogfile(SWITCH_TRUE);\r
-    }\r
-    \r
-       globals.log_size += len;\r
-\r
-       if (globals.log_size >= globals.roll_size) {\r
-               mod_logfile_rotate();\r
-       }\r
-\r
-       return SWITCH_STATUS_SUCCESS;\r
-}\r
-\r
-static switch_status_t mod_logfile_logger(const switch_log_node_t *node, switch_log_level_t level)\r
-{\r
-\r
-       if (levels[node->level].on) {\r
-        mod_logfile_raw_write(node->data);\r
-    }\r
-\r
-       return SWITCH_STATUS_SUCCESS;\r
-}\r
-\r
-static switch_status_t load_config(void)\r
-{\r
-       char *cf = "logfile.conf";\r
-       switch_xml_t cfg, xml, settings, param;\r
-\r
-       if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) {\r
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf);\r
-       } else {\r
-               if ((settings = switch_xml_child(cfg, "settings"))) {\r
-                       for (param = switch_xml_child(settings, "param"); param; param = param->next) {\r
-                               char *var = (char *) switch_xml_attr_soft(param, "name");\r
-                               char *val = (char *) switch_xml_attr_soft(param, "value");\r
-                               if (!strcmp(var, "logfile")) {\r
-                                       set_global_logfile(val);\r
-                               } else if (!strcmp(var, "level")) {\r
-                                       process_levels(val);\r
-                               } else if (!strcmp(var, "rollover")) {\r
-                                       globals.roll_size = atoi(val);\r
-                               }  \r
-                       }\r
-               }\r
-               switch_xml_free(xml);\r
-       }\r
-       if (globals.roll_size == 0) {\r
-               globals.roll_size = DEFAULT_LIMIT;\r
-       }\r
-       if (switch_strlen_zero(globals.logfile)) {\r
-               char logfile[512];\r
-               snprintf(logfile, sizeof(logfile), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, "freeswitch.log");\r
-               set_global_logfile(logfile);\r
-       }\r
-\r
-       return 0;\r
-}\r
-\r
-SWITCH_MODULE_LOAD_FUNCTION(mod_logfile_load)\r
-{\r
-       switch_status_t status;\r
-\r
-       module_pool = pool;\r
-\r
-       /* connect my internal structure to the blank pointer passed to me */\r
-       *module_interface = switch_loadable_module_create_module_interface(pool, modname);\r
-\r
-       if ((status=load_config()) != SWITCH_STATUS_SUCCESS) {\r
-               return status;\r
-       }\r
-\r
-       mod_logfile_openlogfile(SWITCH_TRUE);\r
-\r
-       switch_log_bind_logger(mod_logfile_logger, SWITCH_LOG_DEBUG);\r
-\r
-       return SWITCH_STATUS_SUCCESS;\r
-}\r
-\r
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_logfile_shutdown)\r
-{\r
-       /* TODO:  Need to finish processing pending log messages before we close the file handle */\r
-\r
-       //switch_file_close(globals.log_afd);   \r
-       return SWITCH_STATUS_SUCCESS;\r
-}\r
-\r
-/* For Emacs:\r
-* Local Variables:\r
-* mode:c\r
-* indent-tabs-mode:nil\r
-* tab-width:4\r
-* c-basic-offset:4\r
-* End:\r
-* For VIM:\r
-* vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:\r
-*/\r
+/*
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * 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
+ * Anthony Minessale II <anthmct@yahoo.com>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Anthony LaMantia <anthony@petabit.net>
+ * Michael Jerris <mike@jerris.com>
+ *
+ *
+ * mod_logfile.c -- Filesystem Logging
+ *
+ */
+
+#include <switch.h>
+
+SWITCH_MODULE_LOAD_FUNCTION(mod_logfile_load);
+SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_logfile_shutdown);
+SWITCH_MODULE_DEFINITION(mod_logfile, mod_logfile_load, mod_logfile_shutdown, NULL);
+
+#define DEFAULT_LIMIT   0xA00000 /* About 10 MB */
+#define WARM_FUZZY_OFFSET 256
+#define MAX_ROT 4096 /* why not */
+static const uint8_t STATIC_LEVELS[] = {0, 1, 2, 3, 4, 5, 6, 7, 8};
+
+static switch_status_t load_config(void);
+static switch_memory_pool_t *module_pool = NULL;
+
+static struct {
+       unsigned int log_fd;
+       switch_size_t log_size;   /* keep the log size in check for rotation */
+       switch_size_t roll_size;  /* the size that we want to rotate the file at */
+       char *logfile;
+    int rotate;
+    switch_mutex_t *mutex;
+       switch_file_t *log_afd;
+} globals;
+
+SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_logfile, globals.logfile);
+
+/* i know this is strange but it's the fastest way i could think of managing log levels. */
+/* i'd rather not try to search something each time we get a message to log */
+struct level_set {
+       int level;
+       int on;
+} static levels[] = {
+       {SWITCH_LOG_CONSOLE, 0},   /* 0 */
+       {SWITCH_LOG_ALERT,   0},   /* 1 */
+       {SWITCH_LOG_CRIT,    0},   /* 2 */
+       {SWITCH_LOG_ERROR,   0},   /* 3 */
+       {SWITCH_LOG_WARNING, 0},   /* 4 */
+       {SWITCH_LOG_NOTICE,  0},   /* 5 */
+       {SWITCH_LOG_INFO,    0},   /* 6 */
+       {SWITCH_LOG_DEBUG,   0},   /* 7 */
+};
+
+void process_levels(char *p)
+{
+       int x, argc = 0;
+       char *argv[10] = { 0 };
+
+       if ((argc = switch_separate_string(p, ',', argv, (sizeof(argv) / sizeof(argv[0]))))) {
+               for (x = 0; x < argc; x++) {
+                       if (!strncasecmp(argv[x], "alert", strlen(argv[x]))) {
+                               levels[SWITCH_LOG_ALERT].on = 1;
+                       } else if (!strncasecmp(argv[x], "crit", strlen(argv[x]))) {
+                               levels[SWITCH_LOG_CRIT].on = 1;
+                       } else if (!strncasecmp(argv[x], "error", strlen(argv[x]))) {
+                               levels[SWITCH_LOG_ERROR].on = 1;
+                       } else if (!strncasecmp(argv[x], "warn", strlen(argv[x]))) {
+                               levels[SWITCH_LOG_WARNING].on = 1;
+                       } else if (!strncasecmp(argv[x], "notice", strlen(argv[x]))) {
+                               levels[SWITCH_LOG_NOTICE].on = 1;
+                       } else if (!strncasecmp(argv[x], "info", strlen(argv[x]))) {
+                               levels[SWITCH_LOG_INFO].on = 1;
+                       } else if (!strncasecmp(argv[x], "debug", strlen(argv[x]))) {
+                               levels[SWITCH_LOG_DEBUG].on = 1;
+                       } else if (!strncasecmp(argv[x], "console", strlen(argv[x]))) {
+                               levels[SWITCH_LOG_CONSOLE].on = 1;
+                       } else if (!strncasecmp(argv[x], "all", strlen(argv[x]))) {
+                               int i;
+                               for (i=0; i < (sizeof(levels) / sizeof(struct level_set)); i++) {
+                                       levels[i].on = 1;
+                               }
+                       }
+               }
+       }
+       return;
+}
+
+static switch_status_t mod_logfile_rotate(void);
+
+static switch_status_t mod_logfile_openlogfile(switch_bool_t check)
+{
+       unsigned int flags = 0;
+       switch_file_t *afd;
+       switch_status_t stat;
+
+       flags |= SWITCH_FOPEN_CREATE;
+       flags |= SWITCH_FOPEN_READ;
+       flags |= SWITCH_FOPEN_WRITE;
+       flags |= SWITCH_FOPEN_APPEND;
+
+       stat = switch_file_open(&afd, globals.logfile, flags, SWITCH_FPROT_UREAD|SWITCH_FPROT_UWRITE, module_pool);
+       if (stat != SWITCH_STATUS_SUCCESS) {
+               return SWITCH_STATUS_FALSE;
+       }
+
+       globals.log_afd = afd;
+
+       globals.log_size = switch_file_get_size(globals.log_afd);
+
+       if (check && globals.roll_size && globals.log_size >= globals.roll_size) {
+               mod_logfile_rotate();
+       }
+
+       return SWITCH_STATUS_SUCCESS;
+}
+
+/* rotate the log file */
+static switch_status_t mod_logfile_rotate(void)
+{
+       unsigned int i = 0;
+       char *p = NULL;
+       switch_status_t stat = 0;
+       int64_t offset = 0;
+    switch_memory_pool_t *pool;
+    switch_time_exp_t tm;
+    char date[80] = "";
+    switch_size_t retsize;
+    switch_status_t status = SWITCH_STATUS_SUCCESS;
+    
+    switch_mutex_lock(globals.mutex);
+
+    switch_time_exp_lt(&tm, switch_time_now());
+    switch_strftime(date, &retsize, sizeof(date), "%Y-%m-%d-%H-%M-%S", &tm);
+
+       globals.log_size = 0;
+
+       stat = switch_file_seek(globals.log_afd, SWITCH_SEEK_SET, &offset);
+
+       if (stat != SWITCH_STATUS_SUCCESS) {
+               status = SWITCH_STATUS_FALSE;
+        goto end;
+    }
+
+    
+       p = malloc(strlen(globals.logfile)+WARM_FUZZY_OFFSET);
+    assert(p);
+
+       memset(p, '\0', strlen(globals.logfile)+WARM_FUZZY_OFFSET);
+
+    switch_core_new_memory_pool(&pool);
+
+       for (i=1; i < MAX_ROT; i++) {
+               sprintf((char *)p, "%s.%s.%i", globals.logfile, date, i);
+        if (switch_file_exists(p, pool) == SWITCH_STATUS_SUCCESS) {
+            continue;
+        }
+
+        switch_file_close(globals.log_afd);
+        switch_file_rename(globals.logfile, p, pool);
+        mod_logfile_openlogfile(SWITCH_FALSE);
+        break;
+       }
+
+       free(p);
+
+    switch_core_destroy_memory_pool(&pool);
+
+    switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "New log started.\n");
+
+ end:
+
+    switch_mutex_unlock(globals.mutex);
+
+       return status;
+}
+
+/* write to the actual logfile */
+static switch_status_t mod_logfile_raw_write(char *log_data)
+{
+       switch_size_t len;
+       len = strlen(log_data);
+
+       if (len <= 0) {
+               return SWITCH_STATUS_FALSE;
+    }
+    
+    switch_mutex_lock(globals.mutex);
+
+       if (switch_file_write(globals.log_afd, log_data, &len) != SWITCH_STATUS_SUCCESS) {
+        switch_file_close(globals.log_afd);
+        mod_logfile_openlogfile(SWITCH_TRUE);
+        len = strlen(log_data);
+        switch_file_write(globals.log_afd, log_data, &len);
+    }
+    
+    switch_mutex_unlock(globals.mutex);
+
+       globals.log_size += len;
+
+       if (globals.roll_size && globals.log_size >= globals.roll_size) {
+               mod_logfile_rotate();
+       }
+
+       return SWITCH_STATUS_SUCCESS;
+}
+
+static switch_status_t mod_logfile_logger(const switch_log_node_t *node, switch_log_level_t level)
+{
+
+       if (levels[node->level].on) {
+        mod_logfile_raw_write(node->data);
+    }
+
+       return SWITCH_STATUS_SUCCESS;
+}
+
+static switch_status_t load_config(void)
+{
+       char *cf = "logfile.conf";
+       switch_xml_t cfg, xml, settings, param;
+
+       if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) {
+               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf);
+       } else {
+               if ((settings = switch_xml_child(cfg, "settings"))) {
+                       for (param = switch_xml_child(settings, "param"); param; param = param->next) {
+                               char *var = (char *) switch_xml_attr_soft(param, "name");
+                               char *val = (char *) switch_xml_attr_soft(param, "value");
+                               if (!strcmp(var, "logfile")) {
+                                       set_global_logfile(val);
+                               } else if (!strcmp(var, "rotate")) {
+                    globals.rotate = switch_true(val);
+                               } else if (!strcmp(var, "level")) {
+                                       process_levels(val);
+                               } else if (!strcmp(var, "rollover")) {
+                                       globals.roll_size = atoi(val);
+                    if (globals.roll_size < 0) {
+                        globals.roll_size = 0;
+                    }
+                               }
+                       }
+               }
+               switch_xml_free(xml);
+       }
+    
+       if (switch_strlen_zero(globals.logfile)) {
+               char logfile[512];
+               snprintf(logfile, sizeof(logfile), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, "freeswitch.log");
+               set_global_logfile(logfile);
+       }
+
+       return 0;
+}
+
+
+static void event_handler(switch_event_t *event)
+{
+    const char *sig = switch_event_get_header(event, "Trapped-Signal");
+
+    if (sig && !strcmp(sig, "HUP")) {
+        if (globals.rotate) {
+            mod_logfile_rotate();
+        } else {
+            switch_mutex_lock(globals.mutex);
+            switch_file_close(globals.log_afd);
+            mod_logfile_openlogfile(SWITCH_TRUE);
+            switch_mutex_unlock(globals.mutex);
+        }
+    }
+
+}
+
+
+SWITCH_MODULE_LOAD_FUNCTION(mod_logfile_load)
+{
+       switch_status_t status;
+
+       module_pool = pool;
+    memset(&globals, 0, sizeof(globals));
+    switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, module_pool);
+
+       if (switch_event_bind((char *) modname, SWITCH_EVENT_TRAP, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL) != SWITCH_STATUS_SUCCESS) {
+               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n");
+               return SWITCH_STATUS_GENERR;
+       }
+
+       /* connect my internal structure to the blank pointer passed to me */
+       *module_interface = switch_loadable_module_create_module_interface(pool, modname);
+
+       if ((status=load_config()) != SWITCH_STATUS_SUCCESS) {
+               return status;
+       }
+
+       mod_logfile_openlogfile(SWITCH_TRUE);
+
+       switch_log_bind_logger(mod_logfile_logger, SWITCH_LOG_DEBUG);
+
+       return SWITCH_STATUS_SUCCESS;
+}
+
+SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_logfile_shutdown)
+{
+       /* TODO:  Need to finish processing pending log messages before we close the file handle */
+
+       //switch_file_close(globals.log_afd);
+       return SWITCH_STATUS_SUCCESS;
+}
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:nil
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ */
index 9a7658d69dc4ba0d39237ee3090a2563250fbc37..0c6f5565f29c784299dacf2e3f2857b52fa302a6 100644 (file)
@@ -62,7 +62,7 @@ static HANDLE shutdown_event;
 /* signal handler for when freeswitch is running in background mode.
  * signal triggers the shutdown of freeswitch
  */
-static void handle_SIGHUP(int sig)
+static void handle_SIGTERM(int sig)
 {
        int32_t arg = 0;
        if (sig);
@@ -390,11 +390,9 @@ int main(int argc, char *argv[])
                return 255;
        }
 
-       if (nc) {
-
-               signal(SIGHUP, handle_SIGHUP);
-               signal(SIGTERM, handle_SIGHUP);
+       signal(SIGTERM, handle_SIGTERM);
 
+       if (nc) {
 #ifdef WIN32
                FreeConsole();
 #else