aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorKenneth Lundin <kenneth@erlang.org>2010-09-10 12:06:14 +0200
committerKenneth Lundin <kenneth@erlang.org>2010-09-10 12:06:14 +0200
commitca05a52db5d420975d87d427243531e9c7891d69 (patch)
treeb7c3e6d28928438977ace7ba4b02a150f45b0d11 /lib
parentc2d085e76f38467ea530b294edd3767ade88332c (diff)
parent25d98219be714bf572808d66ea62bb96c2bd64e2 (diff)
downloadotp-ca05a52db5d420975d87d427243531e9c7891d69.tar.gz
otp-ca05a52db5d420975d87d427243531e9c7891d69.tar.bz2
otp-ca05a52db5d420975d87d427243531e9c7891d69.zip
Merge branch 'kenneth/runtime_tools/inviso-patches-from-E-user/OTP-8755' into dev
* kenneth/runtime_tools/inviso-patches-from-E-user/OTP-8755: Minor corrections and remove of temporary workaround.
Diffstat (limited to 'lib')
-rw-r--r--lib/runtime_tools/src/inviso_autostart.erl11
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/runtime_tools/src/inviso_autostart.erl b/lib/runtime_tools/src/inviso_autostart.erl
index 134133ad1f..787292e244 100644
--- a/lib/runtime_tools/src/inviso_autostart.erl
+++ b/lib/runtime_tools/src/inviso_autostart.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2010. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -59,17 +59,10 @@ autostart(_AutoModArgs) ->
case try_load_module(FileNames) of
ok ->
autostart_apply(M,F);
+
false -> % No such module available
"inviso_autostart.config"
end;
- {ok,{gettia_asc,asc_file}} -> % Uggly hack to not have to change in GSN-CPS.
- case try_load_module(["/tmp/DPE_COMMONLOG/gettia_asc",
- "/tmp/DPE_COMMONLOG/gettia_overload"]) of
- ok ->
- autostart_apply(gettia_asc,asc_file);
- false -> % No such module available
- false
- end;
{ok,{M,F}} -> % Use M:F(node())
autostart_apply(M,F);
{ok,no_autostart} ->