[asterisk-commits] oej: trunk r89772 - in /trunk: main/ res/

[SVN commits to the Asterisk project]

Author: oej
Date: Tue Nov 27 15:10:50 2007
New Revision: 89772

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89772
Log:
A few more "moremanager" fixes

Modified:
    trunk/main/asterisk.c
    trunk/main/dnsmgr.c
    trunk/main/enum.c
    trunk/res/res_jabber.c

Modified: trunk/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/trunk/main/asterisk.c?view=diff&rev=89772&r1=89771&r2=89772
==============================================================================
--- trunk/main/asterisk.c (original)
+++ trunk/main/asterisk.c Tue Nov 27 15:10:50 2007
@@ -3073,7 +3073,7 @@
 	__ast_mm_init();
 #endif	
 
-	ast_startuptime = ast_tvnow();
+	ast_lastreloadtime = ast_startuptime = ast_tvnow();
 	ast_cli_register_multiple(cli_asterisk, sizeof(cli_asterisk) / sizeof(struct ast_cli_entry));
 
 	if (ast_opt_console) {

Modified: trunk/main/dnsmgr.c
URL: http://svn.digium.com/view/asterisk/trunk/main/dnsmgr.c?view=diff&rev=89772&r1=89771&r2=89772
==============================================================================
--- trunk/main/dnsmgr.c (original)
+++ trunk/main/dnsmgr.c Tue Nov 27 15:10:50 2007
@@ -37,6 +37,7 @@
 #include "asterisk/config.h"
 #include "asterisk/sched.h"
 #include "asterisk/cli.h"
+#include "asterisk/manager.h"
 
 static struct sched_context *sched;
 static int refresh_sched = -1;
@@ -418,6 +419,7 @@
 		res = 0;
 
 	ast_mutex_unlock(&refresh_lock);
+	manager_event(EVENT_FLAG_SYSTEM, "Reload", "Module: DNSmgr\r\nStatus: %s\r/nMessage: DNSmgr reload Requested\r\n", enabled ? "Enabled" : "Disabled");
 
 	return res;
 }

Modified: trunk/main/enum.c
URL: http://svn.digium.com/view/asterisk/trunk/main/enum.c?view=diff&rev=89772&r1=89771&r2=89772
==============================================================================
--- trunk/main/enum.c (original)
+++ trunk/main/enum.c Tue Nov 27 15:10:50 2007
@@ -61,6 +61,7 @@
 #include "asterisk/channel.h"
 #include "asterisk/config.h"
 #include "asterisk/utils.h"
+#include "asterisk/manager.h"
 
 #ifdef __APPLE__
 #undef T_NAPTR
@@ -639,6 +640,7 @@
 	}
 	enumver++;
 	ast_mutex_unlock(&enumlock);
+	manager_event(EVENT_FLAG_SYSTEM, "Reload", "Module: Enum\r\nStatus: Enabled\r\nMessage: ENUM reload Requested\r\n");
 	return 0;
 }
 

Modified: trunk/res/res_jabber.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_jabber.c?view=diff&rev=89772&r1=89771&r2=89772
==============================================================================
--- trunk/res/res_jabber.c (original)
+++ trunk/res/res_jabber.c Tue Nov 27 15:10:50 2007
@@ -2929,14 +2929,14 @@
 	}	
 	if (strchr(screenname, '@') && message){
 		ast_aji_send_chat(client, screenname, message);	
+		astman_append(s, "Response: Success\r\n");
 		if (!ast_strlen_zero(id))
 			astman_append(s, "ActionID: %s\r\n",id);
-		astman_append(s, "Response: Success\r\n");
 		return 0;
 	}
+	astman_append(s, "Response: Error\r\n");
 	if (!ast_strlen_zero(id))
 		astman_append(s, "ActionID: %s\r\n",id);
-	astman_append(s, "Response: Failure\r\n");
 	return 0;
 }