diff options
| author | Micael Karlberg <bmk@erlang.org> | 2019-09-12 15:00:55 +0200 |
|---|---|---|
| committer | Micael Karlberg <bmk@erlang.org> | 2019-09-12 16:09:38 +0200 |
| commit | 6fde54f9e293879a45671919523cb49460c8f2ae (patch) | |
| tree | b61bff031bac73ddc5f2a1d070132dbd95f2f134 | |
| parent | a57bf61158accddbde6c67b402bcf47f48c5b670 (diff) | |
| download | erlang-6fde54f9e293879a45671919523cb49460c8f2ae.tar.gz | |
[snmp|manager|doc] Document the new (cbproxy) option
OTP-15947
| -rw-r--r-- | lib/snmp/doc/src/snmp_app.xml | 25 | ||||
| -rw-r--r-- | lib/snmp/doc/src/snmp_config.xml | 23 |
2 files changed, 45 insertions, 3 deletions
diff --git a/lib/snmp/doc/src/snmp_app.xml b/lib/snmp/doc/src/snmp_app.xml index d5ac97ef15..2ae07601d4 100644 --- a/lib/snmp/doc/src/snmp_app.xml +++ b/lib/snmp/doc/src/snmp_app.xml @@ -4,7 +4,7 @@ <appref> <header> <copyright> - <year>1997</year><year>2016</year> + <year>1997</year><year>2019</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -582,7 +582,7 @@ <tag><marker id="manager_server"></marker> <c><![CDATA[server() = [server_opt()] <optional>]]></c></tag> <item> - <p><c>server_opt() = {timeout, server_timeout()} | {verbosity, verbosity()}</c></p> + <p><c>server_opt() = {timeout, server_timeout()} | {verbosity, verbosity()} | {cbproxy, server_cbproxy()}</c></p> <p>Specifies the options for the manager server process.</p> <p>Default is <c>silence</c>.</p> </item> @@ -608,6 +608,27 @@ <p>Default is <c>30000</c>.</p> </item> + <tag><marker id="manager_server_cbproxy"></marker> + <c><![CDATA[server_cbproxy() = temporary (default) | permanent <optional>]]></c></tag> + <item> + <p>This option specifies how the server will handle callback calls.</p> + <taglist> + <tag><marker id="manager_server_cbproxy_temporary"></marker> + <c><![CDATA[temporary (default)]]></c></tag> + <item> + <p>A temporary process will be created for each callback call. </p> + </item> + + <tag><marker id="manager_server_cbproxy_temporary"></marker> + <c><![CDATA[permanent]]></c></tag> + <item> + <p>With this the server will create a permanent (named) process that + in effect serializes all callback calls.</p> + </item> + </taglist> + <p>Default is <c>temporary</c>.</p> + </item> + <tag><marker id="manager_config"></marker> <c><![CDATA[manager_config() = [manager_config_opt()] <mandatory>]]></c></tag> <item> diff --git a/lib/snmp/doc/src/snmp_config.xml b/lib/snmp/doc/src/snmp_config.xml index 6d4129dd06..6daa3ced21 100644 --- a/lib/snmp/doc/src/snmp_config.xml +++ b/lib/snmp/doc/src/snmp_config.xml @@ -611,7 +611,7 @@ in so far as it will be converted to the new format if found. <tag><marker id="manager_server"></marker> <c><![CDATA[server() = [server_opt()] <optional>]]></c></tag> <item> - <p><c>server_opt() = {timeout, server_timeout()} | {verbosity, verbosity()}</c></p> + <p><c>server_opt() = {timeout, server_timeout()} | {verbosity, verbosity()} | {cbproxy, server_cbproxy()}</c></p> <p>Specifies the options for the manager server process.</p> <p>Default is <c>silence</c>.</p> </item> @@ -637,6 +637,27 @@ in so far as it will be converted to the new format if found. <p>Default is <c>30000</c>.</p> </item> + <tag><marker id="manager_server_cbproxy"></marker> + <c><![CDATA[server_cbproxy() = temporary (default) | permanent <optional>]]></c></tag> + <item> + <p>This option specifies how the server will handle callback calls.</p> + <taglist> + <tag><marker id="manager_server_cbproxy_temporary"></marker> + <c><![CDATA[temporary (default)]]></c></tag> + <item> + <p>A temporary process will be created for each callback call. </p> + </item> + + <tag><marker id="manager_server_cbproxy_temporary"></marker> + <c><![CDATA[permanent]]></c></tag> + <item> + <p>With this the server will create a permanent (named) process that + in effect serializes all callback calls.</p> + </item> + </taglist> + <p>Default is <c>temporary</c>.</p> + </item> + <tag><marker id="manager_config"></marker> <c><![CDATA[manager_config() = [manager_config_opt()] <mandatory>]]></c></tag> <item> |