[svn-commits] russell: trunk r282067 - in /trunk: ./ CHANGES main/cli.c

[SVN commits to the Digium repositories]

Author: russell
Date: Thu Aug 12 15:44:39 2010
New Revision: 282067

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=282067
Log:
Merged revisions 282066 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r282066 | russell | 2010-08-12 15:41:17 -0500 (Thu, 12 Aug 2010) | 4 lines
  
  Add a "core reload" CLI command.
  
  Review: https://reviewboard.asterisk.org/r/859/
........

Modified:
    trunk/   (props changed)
    trunk/CHANGES
    trunk/main/cli.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/CHANGES
URL: http://svnview.digium.com/svn/asterisk/trunk/CHANGES?view=diff&rev=282067&r1=282066&r2=282067
==============================================================================
--- trunk/CHANGES (original)
+++ trunk/CHANGES Thu Aug 12 15:44:39 2010
@@ -560,6 +560,7 @@
    manager.conf. 
  * Added 'all' keyword to the CLI command "channel request hangup" so that you can send
    the channel hangup request to all channels.
+ * Added a "core reload" CLI command that executes a global reload of Asterisk.
 
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 1.6.1 to Asterisk 1.6.2  -------------

Modified: trunk/main/cli.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/cli.c?view=diff&rev=282067&r1=282066&r2=282067
==============================================================================
--- trunk/main/cli.c (original)
+++ trunk/main/cli.c Thu Aug 12 15:44:39 2010
@@ -303,6 +303,28 @@
 	return CLI_SUCCESS;
 }
 
+static char *handle_core_reload(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
+{
+	switch (cmd) {
+	case CLI_INIT:
+		e->command = "core reload";
+		e->usage =
+			"Usage: core reload\n"
+			"       Execute a global reload.\n";
+		return NULL;
+
+	case CLI_GENERATE:
+		return NULL;
+	}
+
+	if (a->argc != e->args) {
+		return CLI_SHOWUSAGE;
+	}
+
+	ast_module_reload(NULL);
+
+	return CLI_SUCCESS;
+}
 /*! 
  * \brief Find the debug or verbose file setting 
  * \arg debug 1 for debug, 0 for verbose
@@ -1620,7 +1642,9 @@
 
 	AST_CLI_DEFINE(handle_load, "Load a module by name"),
 
-	AST_CLI_DEFINE(handle_reload, "Reload configuration"),
+	AST_CLI_DEFINE(handle_reload, "Reload configuration for a module"),
+
+	AST_CLI_DEFINE(handle_core_reload, "Global reload"),
 
 	AST_CLI_DEFINE(handle_unload, "Unload a module by name"),