diff options
| author | Micael Karlberg <[email protected]> | 2011-11-08 16:29:34 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-11-08 16:29:34 +0100 |
| commit | c4ba4b92ba9caed7b1a6732ac53c78330b4558fd (patch) | |
| tree | 0eb24ad030e08c56f2efa9a1b4ea96cc5dfa947b /lib/kernel/src/application.erl | |
| parent | b3929cdc4479170842d36a7f2ba757ff052e098b (diff) | |
| parent | 12a5e61df498ec80383514ca79b795c40522e19a (diff) | |
| download | otp-c4ba4b92ba9caed7b1a6732ac53c78330b4558fd.tar.gz otp-c4ba4b92ba9caed7b1a6732ac53c78330b4558fd.tar.bz2 otp-c4ba4b92ba9caed7b1a6732ac53c78330b4558fd.zip | |
Merge branch 'master' of super:otp into bmk/snmp/compiler/misc/OTP-9618
Diffstat (limited to 'lib/kernel/src/application.erl')
| -rw-r--r-- | lib/kernel/src/application.erl | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/kernel/src/application.erl b/lib/kernel/src/application.erl index fa3a4c3d36..caac4d926c 100644 --- a/lib/kernel/src/application.erl +++ b/lib/kernel/src/application.erl @@ -28,8 +28,6 @@ -export([get_application/0, get_application/1, info/0]). -export([start_type/0]). --export([behaviour_info/1]). - %%%----------------------------------------------------------------- -type start_type() :: 'normal' @@ -59,12 +57,12 @@ %%------------------------------------------------------------------ --spec behaviour_info(atom()) -> 'undefined' | [{atom(), byte()}]. +-callback start(StartType :: normal | {takeover, node()} | {failover, node()}, + StartArgs :: term()) -> + {ok, pid()} | {ok, pid(), State :: term()} | {error, Reason :: term}. -behaviour_info(callbacks) -> - [{start,2},{stop,1}]; -behaviour_info(_Other) -> - undefined. +-callback stop(State :: term()) -> + term(). %%%----------------------------------------------------------------- %%% This module is API towards application_controller and |