[Asterisk-code-review] cdr_syslog: Remove deprecated module. (asterisk[master])

Joshua Colp asteriskteam at digium.com
Mon Aug 16 13:04:36 CDT 2021


Joshua Colp has uploaded this change for review. ( https://gerrit.asterisk.org/c/asterisk/+/16310 )


Change subject: cdr_syslog: Remove deprecated module.
......................................................................

cdr_syslog: Remove deprecated module.

ASTERISK-29592

Change-Id: Ic8eb6a2100ad5bc3b48338a6d0a6cfa70ecbc50f
---
D cdr/cdr_syslog.c
A doc/UPGRADE-staging/cdr_syslog_removal.txt
2 files changed, 6 insertions(+), 298 deletions(-)



  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/10/16310/1

diff --git a/cdr/cdr_syslog.c b/cdr/cdr_syslog.c
deleted file mode 100644
index 84e19b9..0000000
--- a/cdr/cdr_syslog.c
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
- * Asterisk -- An open source telephony toolkit.
- *
- * Copyright (C) 2009, malleable, LLC.
- *
- * Sean Bright <sean at malleable.com>
- *
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
- */
-
-/*!
- * \file
- * \brief syslog CDR logger
- *
- * \author Sean Bright <sean at malleable.com>
- *
- * See also
- * \arg \ref Config_cdr
- * \ingroup cdr_drivers
- */
-
-/*! \li \ref cdr_syslog.c uses the configuration file \ref cdr_syslog.conf
- * \addtogroup configuration_file Configuration Files
- */
-
-/*!
- * \page cdr_syslog.conf cdr_syslog.conf
- * \verbinclude cdr_syslog.conf.sample
- */
-
-/*** MODULEINFO
-	<depend>syslog</depend>
-	<defaultenabled>no</defaultenabled>
-	<support_level>deprecated</support_level>
-	<deprecated_in>16</deprecated_in>
-	<removed_in>19</removed_in>
-***/
-
-#include "asterisk.h"
-
-#include "asterisk/module.h"
-#include "asterisk/lock.h"
-#include "asterisk/cdr.h"
-#include "asterisk/pbx.h"
-
-#include <syslog.h>
-
-#include "asterisk/syslog.h"
-
-static const char CONFIG[] = "cdr_syslog.conf";
-
-AST_THREADSTORAGE(syslog_buf);
-
-static const char name[] = "cdr-syslog";
-
-struct cdr_syslog_config {
-	AST_DECLARE_STRING_FIELDS(
-		AST_STRING_FIELD(ident);
-		AST_STRING_FIELD(format);
-	);
-	int facility;
-	int priority;
-	ast_mutex_t lock;
-	AST_LIST_ENTRY(cdr_syslog_config) list;
-};
-
-static AST_RWLIST_HEAD_STATIC(sinks, cdr_syslog_config);
-
-static void free_config(void)
-{
-	struct cdr_syslog_config *sink;
-
-	while ((sink = AST_RWLIST_REMOVE_HEAD(&sinks, list))) {
-		ast_mutex_destroy(&sink->lock);
-		ast_string_field_free_memory(sink);
-		ast_free(sink);
-	}
-}
-
-static int syslog_log(struct ast_cdr *cdr)
-{
-	struct ast_channel *dummy;
-	struct ast_str *str;
-	struct cdr_syslog_config *sink;
-
-	/* Batching saves memory management here.  Otherwise, it's the same as doing an
-	   allocation and free each time. */
-	if (!(str = ast_str_thread_get(&syslog_buf, 16))) {
-		return -1;
-	}
-
-	if (!(dummy = ast_dummy_channel_alloc())) {
-		ast_log(AST_LOG_ERROR, "Unable to allocate channel for variable substitution.\n");
-		return -1;
-	}
-
-	/* We need to dup here since the cdr actually belongs to the other channel,
-	   so when we release this channel we don't want the CDR getting cleaned
-	   up prematurely. */
-	ast_channel_cdr_set(dummy, ast_cdr_dup(cdr));
-
-	AST_RWLIST_RDLOCK(&sinks);
-
-	AST_LIST_TRAVERSE(&sinks, sink, list) {
-
-		ast_str_substitute_variables(&str, 0, dummy, sink->format);
-
-		/* Even though we have a lock on the list, we could be being chased by
-		   another thread and this lock ensures that we won't step on anyone's
-		   toes.  Once each CDR backend gets it's own thread, this lock can be
-		   removed. */
-		ast_mutex_lock(&sink->lock);
-
-		openlog(sink->ident, LOG_CONS, sink->facility);
-		syslog(sink->priority, "%s", ast_str_buffer(str));
-		closelog();
-
-		ast_mutex_unlock(&sink->lock);
-	}
-
-	AST_RWLIST_UNLOCK(&sinks);
-
-	ast_channel_unref(dummy);
-
-	return 0;
-}
-
-static int load_config(int reload)
-{
-	struct ast_config *cfg;
-	struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
-	int default_facility = LOG_LOCAL4;
-	int default_priority = LOG_INFO;
-	const char *catg = NULL, *tmp;
-
-	cfg = ast_config_load(CONFIG, config_flags);
-	if (cfg == CONFIG_STATUS_FILEMISSING || cfg == CONFIG_STATUS_FILEINVALID) {
-		ast_log(AST_LOG_ERROR,
-			"Unable to load %s. Not logging custom CSV CDRs to syslog.\n", CONFIG);
-		return -1;
-	} else if (cfg == CONFIG_STATUS_FILEUNCHANGED) {
-		return 0;
-	}
-
-	if (reload) {
-		free_config();
-	}
-
-	if (!(ast_strlen_zero(tmp = ast_variable_retrieve(cfg, "general", "facility")))) {
-		int facility = ast_syslog_facility(tmp);
-		if (facility < 0) {
-			ast_log(AST_LOG_WARNING,
-				"Invalid facility '%s' specified, defaulting to '%s'\n",
-				tmp, ast_syslog_facility_name(default_facility));
-		} else {
-			default_facility = facility;
-		}
-	}
-
-	if (!(ast_strlen_zero(tmp = ast_variable_retrieve(cfg, "general", "priority")))) {
-		int priority = ast_syslog_priority(tmp);
-		if (priority < 0) {
-			ast_log(AST_LOG_WARNING,
-				"Invalid priority '%s' specified, defaulting to '%s'\n",
-				tmp, ast_syslog_priority_name(default_priority));
-		} else {
-			default_priority = priority;
-		}
-	}
-
-	while ((catg = ast_category_browse(cfg, catg))) {
-		struct cdr_syslog_config *sink;
-
-		if (!strcasecmp(catg, "general")) {
-			continue;
-		}
-
-		if (ast_strlen_zero(tmp = ast_variable_retrieve(cfg, catg, "template"))) {
-			ast_log(AST_LOG_WARNING,
-				"No 'template' parameter found for '%s'.  Skipping.\n", catg);
-			continue;
-		}
-
-		sink = ast_calloc_with_stringfields(1, struct cdr_syslog_config, 1024);
-
-		if (!sink) {
-			ast_log(AST_LOG_ERROR,
-				"Unable to allocate memory for configuration settings.\n");
-			free_config();
-			break;
-		}
-
-		ast_mutex_init(&sink->lock);
-		ast_string_field_set(sink, ident, catg);
-		ast_string_field_set(sink, format, tmp);
-
-		if (ast_strlen_zero(tmp = ast_variable_retrieve(cfg, catg, "facility"))) {
-			sink->facility = default_facility;
-		} else {
-			int facility = ast_syslog_facility(tmp);
-			if (facility < 0) {
-				ast_log(AST_LOG_WARNING,
-					"Invalid facility '%s' specified for '%s,' defaulting to '%s'\n",
-					tmp, catg, ast_syslog_facility_name(default_facility));
-			} else {
-				sink->facility = facility;
-			}
-		}
-
-		if (ast_strlen_zero(tmp = ast_variable_retrieve(cfg, catg, "priority"))) {
-			sink->priority = default_priority;
-		} else {
-			int priority = ast_syslog_priority(tmp);
-			if (priority < 0) {
-				ast_log(AST_LOG_WARNING,
-					"Invalid priority '%s' specified for '%s,' defaulting to '%s'\n",
-					tmp, catg, ast_syslog_priority_name(default_priority));
-			} else {
-				sink->priority = priority;
-			}
-		}
-
-		AST_RWLIST_INSERT_TAIL(&sinks, sink, list);
-	}
-
-	ast_config_destroy(cfg);
-
-	return AST_RWLIST_EMPTY(&sinks) ? -1 : 0;
-}
-
-static int unload_module(void)
-{
-	if (ast_cdr_unregister(name)) {
-		return -1;
-	}
-
-	if (AST_RWLIST_WRLOCK(&sinks)) {
-		ast_cdr_register(name, ast_module_info->description, syslog_log);
-		ast_log(AST_LOG_ERROR, "Unable to lock sink list.  Unload failed.\n");
-		return -1;
-	}
-
-	free_config();
-	AST_RWLIST_UNLOCK(&sinks);
-	return 0;
-}
-
-static enum ast_module_load_result load_module(void)
-{
-	int res;
-
-	if (AST_RWLIST_WRLOCK(&sinks)) {
-		ast_log(AST_LOG_ERROR, "Unable to lock sink list.  Load failed.\n");
-		return AST_MODULE_LOAD_DECLINE;
-	}
-
-	res = load_config(0);
-	AST_RWLIST_UNLOCK(&sinks);
-	if (res) {
-		return AST_MODULE_LOAD_DECLINE;
-	}
-	ast_cdr_register(name, ast_module_info->description, syslog_log);
-	return AST_MODULE_LOAD_SUCCESS;
-}
-
-static int reload(void)
-{
-	int res;
-	if (AST_RWLIST_WRLOCK(&sinks)) {
-		ast_log(AST_LOG_ERROR, "Unable to lock sink list.  Load failed.\n");
-		return AST_MODULE_LOAD_DECLINE;
-	}
-
-	if ((res = load_config(1))) {
-		free_config();
-	}
-
-	AST_RWLIST_UNLOCK(&sinks);
-
-	return res ? AST_MODULE_LOAD_DECLINE : AST_MODULE_LOAD_SUCCESS;
-}
-
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Customizable syslog CDR Backend",
-	.support_level = AST_MODULE_SUPPORT_CORE,
-	.load = load_module,
-	.unload = unload_module,
-	.reload = reload,
-	.load_pri = AST_MODPRI_CDR_DRIVER,
-	.requires = "cdr",
-);
diff --git a/doc/UPGRADE-staging/cdr_syslog_removal.txt b/doc/UPGRADE-staging/cdr_syslog_removal.txt
new file mode 100644
index 0000000..17f88dd
--- /dev/null
+++ b/doc/UPGRADE-staging/cdr_syslog_removal.txt
@@ -0,0 +1,6 @@
+Subject: cdr_syslog
+Master-Only: True
+
+This module was deprecated in Asterisk 16
+and is now being removed in accordance with
+the Asterisk Module Deprecation policy.

-- 
To view, visit https://gerrit.asterisk.org/c/asterisk/+/16310
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Change-Id: Ic8eb6a2100ad5bc3b48338a6d0a6cfa70ecbc50f
Gerrit-Change-Number: 16310
Gerrit-PatchSet: 1
Gerrit-Owner: Joshua Colp <jcolp at sangoma.com>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20210816/e534fa39/attachment-0001.html>


More information about the asterisk-code-review mailing list