[asterisk-commits] make ari-stubs so doc periodic jobs can run (asterisk[13])
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Apr 20 07:18:26 CDT 2017
George Joseph has submitted this change and it was merged. ( https://gerrit.asterisk.org/5493 )
Change subject: make ari-stubs so doc periodic jobs can run
......................................................................
make ari-stubs so doc periodic jobs can run
The periodic doc job does a make ari-stubs and checks that
there are no changes before generating the docs. Since I changed
the mustache template (and the generated code directly) recently
and forgot to regenerate the stubs, the doc job thinks they're out
of date.
Change-Id: Ibd4bc649556615ff714d44534c45b6c2f6aa449d
---
M res/res_ari_applications.c
M res/res_ari_asterisk.c
M res/res_ari_bridges.c
M res/res_ari_channels.c
M res/res_ari_device_states.c
M res/res_ari_endpoints.c
M res/res_ari_events.c
M res/res_ari_mailboxes.c
M res/res_ari_playbacks.c
M res/res_ari_recordings.c
M res/res_ari_sounds.c
11 files changed, 130 insertions(+), 81 deletions(-)
Approvals:
Mark Michelson: Looks good to me, approved
George Joseph: Looks good to me, approved; Verified
Richard Mudgett: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, but someone else must approve
diff --git a/res/res_ari_applications.c b/res/res_ari_applications.c
index ac2c3ba..cb12e84 100644
--- a/res/res_ari_applications.c
+++ b/res/res_ari_applications.c
@@ -492,14 +492,6 @@
.children = { &applications_applicationName, }
};
-static int load_module(void)
-{
- int res = 0;
- stasis_app_ref();
- res |= ast_ari_add_handler(&applications);
- return res;
-}
-
static int unload_module(void)
{
ast_ari_remove_handler(&applications);
@@ -507,6 +499,19 @@
return 0;
}
+static int load_module(void)
+{
+ int res = 0;
+ stasis_app_ref();
+ res |= ast_ari_add_handler(&applications);
+ if (res) {
+ unload_module();
+ return AST_MODULE_LOAD_DECLINE;
+ }
+
+ return AST_MODULE_LOAD_SUCCESS;
+}
+
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Stasis application resources",
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
diff --git a/res/res_ari_asterisk.c b/res/res_ari_asterisk.c
index b1680e3..1a574aa 100644
--- a/res/res_ari_asterisk.c
+++ b/res/res_ari_asterisk.c
@@ -1213,14 +1213,6 @@
.children = { &asterisk_config,&asterisk_info,&asterisk_modules,&asterisk_logging,&asterisk_variable, }
};
-static int load_module(void)
-{
- int res = 0;
- stasis_app_ref();
- res |= ast_ari_add_handler(&asterisk);
- return res;
-}
-
static int unload_module(void)
{
ast_ari_remove_handler(&asterisk);
@@ -1228,6 +1220,19 @@
return 0;
}
+static int load_module(void)
+{
+ int res = 0;
+ stasis_app_ref();
+ res |= ast_ari_add_handler(&asterisk);
+ if (res) {
+ unload_module();
+ return AST_MODULE_LOAD_DECLINE;
+ }
+
+ return AST_MODULE_LOAD_SUCCESS;
+}
+
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Asterisk resources",
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
diff --git a/res/res_ari_bridges.c b/res/res_ari_bridges.c
index 2889c15..69d4d6e 100644
--- a/res/res_ari_bridges.c
+++ b/res/res_ari_bridges.c
@@ -1405,14 +1405,6 @@
.children = { &bridges_bridgeId, }
};
-static int load_module(void)
-{
- int res = 0;
- stasis_app_ref();
- res |= ast_ari_add_handler(&bridges);
- return res;
-}
-
static int unload_module(void)
{
ast_ari_remove_handler(&bridges);
@@ -1420,6 +1412,19 @@
return 0;
}
+static int load_module(void)
+{
+ int res = 0;
+ stasis_app_ref();
+ res |= ast_ari_add_handler(&bridges);
+ if (res) {
+ unload_module();
+ return AST_MODULE_LOAD_DECLINE;
+ }
+
+ return AST_MODULE_LOAD_SUCCESS;
+}
+
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Bridge resources",
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
diff --git a/res/res_ari_channels.c b/res/res_ari_channels.c
index fca0cef..f59f206 100644
--- a/res/res_ari_channels.c
+++ b/res/res_ari_channels.c
@@ -2469,14 +2469,6 @@
.children = { &channels_channelId, }
};
-static int load_module(void)
-{
- int res = 0;
- stasis_app_ref();
- res |= ast_ari_add_handler(&channels);
- return res;
-}
-
static int unload_module(void)
{
ast_ari_remove_handler(&channels);
@@ -2484,6 +2476,19 @@
return 0;
}
+static int load_module(void)
+{
+ int res = 0;
+ stasis_app_ref();
+ res |= ast_ari_add_handler(&channels);
+ if (res) {
+ unload_module();
+ return AST_MODULE_LOAD_DECLINE;
+ }
+
+ return AST_MODULE_LOAD_SUCCESS;
+}
+
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Channel resources",
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
diff --git a/res/res_ari_device_states.c b/res/res_ari_device_states.c
index cf0b7a9..a3711e6 100644
--- a/res/res_ari_device_states.c
+++ b/res/res_ari_device_states.c
@@ -323,14 +323,6 @@
.children = { &deviceStates_deviceName, }
};
-static int load_module(void)
-{
- int res = 0;
- stasis_app_ref();
- res |= ast_ari_add_handler(&deviceStates);
- return res;
-}
-
static int unload_module(void)
{
ast_ari_remove_handler(&deviceStates);
@@ -338,6 +330,19 @@
return 0;
}
+static int load_module(void)
+{
+ int res = 0;
+ stasis_app_ref();
+ res |= ast_ari_add_handler(&deviceStates);
+ if (res) {
+ unload_module();
+ return AST_MODULE_LOAD_DECLINE;
+ }
+
+ return AST_MODULE_LOAD_SUCCESS;
+}
+
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Device state resources",
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
diff --git a/res/res_ari_endpoints.c b/res/res_ari_endpoints.c
index 4a5ddd9..43d2558 100644
--- a/res/res_ari_endpoints.c
+++ b/res/res_ari_endpoints.c
@@ -447,14 +447,6 @@
.children = { &endpoints_sendMessage,&endpoints_tech, }
};
-static int load_module(void)
-{
- int res = 0;
- stasis_app_ref();
- res |= ast_ari_add_handler(&endpoints);
- return res;
-}
-
static int unload_module(void)
{
ast_ari_remove_handler(&endpoints);
@@ -462,6 +454,19 @@
return 0;
}
+static int load_module(void)
+{
+ int res = 0;
+ stasis_app_ref();
+ res |= ast_ari_add_handler(&endpoints);
+ if (res) {
+ unload_module();
+ return AST_MODULE_LOAD_DECLINE;
+ }
+
+ return AST_MODULE_LOAD_SUCCESS;
+}
+
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Endpoint resources",
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
diff --git a/res/res_ari_events.c b/res/res_ari_events.c
index 461b314..fd208c5 100644
--- a/res/res_ari_events.c
+++ b/res/res_ari_events.c
@@ -448,7 +448,6 @@
res |= ast_websocket_server_add_protocol2(events.ws_server, protocol);
stasis_app_ref();
res |= ast_ari_add_handler(&events);
-
if (res) {
unload_module();
return AST_MODULE_LOAD_DECLINE;
diff --git a/res/res_ari_mailboxes.c b/res/res_ari_mailboxes.c
index 8e0648b..f85541c 100644
--- a/res/res_ari_mailboxes.c
+++ b/res/res_ari_mailboxes.c
@@ -329,14 +329,6 @@
.children = { &mailboxes_mailboxName, }
};
-static int load_module(void)
-{
- int res = 0;
- stasis_app_ref();
- res |= ast_ari_add_handler(&mailboxes);
- return res;
-}
-
static int unload_module(void)
{
ast_ari_remove_handler(&mailboxes);
@@ -344,6 +336,19 @@
return 0;
}
+static int load_module(void)
+{
+ int res = 0;
+ stasis_app_ref();
+ res |= ast_ari_add_handler(&mailboxes);
+ if (res) {
+ unload_module();
+ return AST_MODULE_LOAD_DECLINE;
+ }
+
+ return AST_MODULE_LOAD_SUCCESS;
+}
+
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Mailboxes resources",
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
diff --git a/res/res_ari_playbacks.c b/res/res_ari_playbacks.c
index a0ebd66..25e211c 100644
--- a/res/res_ari_playbacks.c
+++ b/res/res_ari_playbacks.c
@@ -281,14 +281,6 @@
.children = { &playbacks_playbackId, }
};
-static int load_module(void)
-{
- int res = 0;
- stasis_app_ref();
- res |= ast_ari_add_handler(&playbacks);
- return res;
-}
-
static int unload_module(void)
{
ast_ari_remove_handler(&playbacks);
@@ -296,6 +288,19 @@
return 0;
}
+static int load_module(void)
+{
+ int res = 0;
+ stasis_app_ref();
+ res |= ast_ari_add_handler(&playbacks);
+ if (res) {
+ unload_module();
+ return AST_MODULE_LOAD_DECLINE;
+ }
+
+ return AST_MODULE_LOAD_SUCCESS;
+}
+
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Playback control resources",
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
diff --git a/res/res_ari_recordings.c b/res/res_ari_recordings.c
index bdcf676..29720a8 100644
--- a/res/res_ari_recordings.c
+++ b/res/res_ari_recordings.c
@@ -797,14 +797,6 @@
.children = { &recordings_stored,&recordings_live, }
};
-static int load_module(void)
-{
- int res = 0;
- stasis_app_ref();
- res |= ast_ari_add_handler(&recordings);
- return res;
-}
-
static int unload_module(void)
{
ast_ari_remove_handler(&recordings);
@@ -812,6 +804,19 @@
return 0;
}
+static int load_module(void)
+{
+ int res = 0;
+ stasis_app_ref();
+ res |= ast_ari_add_handler(&recordings);
+ if (res) {
+ unload_module();
+ return AST_MODULE_LOAD_DECLINE;
+ }
+
+ return AST_MODULE_LOAD_SUCCESS;
+}
+
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Recording resources",
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
diff --git a/res/res_ari_sounds.c b/res/res_ari_sounds.c
index 48fa204..6d09d2c 100644
--- a/res/res_ari_sounds.c
+++ b/res/res_ari_sounds.c
@@ -211,14 +211,6 @@
.children = { &sounds_soundId, }
};
-static int load_module(void)
-{
- int res = 0;
- stasis_app_ref();
- res |= ast_ari_add_handler(&sounds);
- return res;
-}
-
static int unload_module(void)
{
ast_ari_remove_handler(&sounds);
@@ -226,6 +218,19 @@
return 0;
}
+static int load_module(void)
+{
+ int res = 0;
+ stasis_app_ref();
+ res |= ast_ari_add_handler(&sounds);
+ if (res) {
+ unload_module();
+ return AST_MODULE_LOAD_DECLINE;
+ }
+
+ return AST_MODULE_LOAD_SUCCESS;
+}
+
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Sound resources",
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
--
To view, visit https://gerrit.asterisk.org/5493
To unsubscribe, visit https://gerrit.asterisk.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd4bc649556615ff714d44534c45b6c2f6aa449d
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Owner: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Mark Michelson <mmichelson at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>
More information about the asterisk-commits
mailing list