diff options
| author | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-24 22:21:58 +0000 |
|---|---|---|
| committer | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-24 22:21:58 +0000 |
| commit | 0c7add2a03853889c326ba56c1cde3025b23722e (patch) | |
| tree | 18c1cdd9756be0e1dc1ea3d6b3e30a54547a2ae4 /main | |
| parent | d73af600f34c55dd7d5c8514e467e8a66875ceac (diff) | |
Merge the rest of the FullyBooted patch
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@265467 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/asterisk.c | 1 | ||||
| -rw-r--r-- | main/manager.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index fd29a6f64..a9844de96 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -3723,6 +3723,7 @@ int main(int argc, char *argv[]) sig_alert_pipe[0] = sig_alert_pipe[1] = -1; ast_set_flag(&ast_options, AST_OPT_FLAG_FULLY_BOOTED); + manager_event(EVENT_FLAG_SYSTEM, "FullyBooted", "Status: Fully Booted\r\n"); ast_process_pending_reloads(); diff --git a/main/manager.c b/main/manager.c index 297e94f5f..f23cec8a2 100644 --- a/main/manager.c +++ b/main/manager.c @@ -2740,6 +2740,9 @@ static int action_login(struct mansession *s, const struct message *m) ast_verb(2, "%sManager '%s' logged on from %s\n", (s->session->managerid ? "HTTP " : ""), s->session->username, ast_inet_ntoa(s->session->sin.sin_addr)); } astman_send_ack(s, m, "Authentication accepted"); + if (ast_test_flag(&ast_options, AST_OPT_FLAG_FULLY_BOOTED)) { + manager_event(EVENT_FLAG_SYSTEM, "FullyBooted", "Status: Fully Booted\r\n"); + } return 0; } |