forks/erlang-sqlite3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove error messages about driver being permanent

Browse Source
This commit is contained in:
Alexey Romanov
2010-12-06 19:14:32 +03:00
parent 7ef6bec04c
commit ee13fe6970
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/sqlite3.erl
View File

@@ -539,6 +539,9 @@ init(Options) ->
ok -> ok ->
Port = open_port({spawn, create_port_cmd(DbFile)}, [binary]), Port = open_port({spawn, create_port_cmd(DbFile)}, [binary]),
{ok, #state{port = Port, ops = Options}}; {ok, #state{port = Port, ops = Options}};
{error, permanent} -> %% already loaded!
Port = open_port({spawn, create_port_cmd(DbFile)}, [binary]),
{ok, #state{port = Port, ops = Options}};
{error, Error} -> {error, Error} ->
Msg = io_lib:format("Error loading ~p: ~s", Msg = io_lib:format("Error loading ~p: ~s",
[?DRIVER_NAME, erl_ddll:format_error(Error)]), [?DRIVER_NAME, erl_ddll:format_error(Error)]),
@@ -683,10 +686,13 @@ terminate(_Reason, #state{port = Port}) ->
case erl_ddll:unload(?DRIVER_NAME) of case erl_ddll:unload(?DRIVER_NAME) of
ok -> ok ->
ok; ok;
{error, permanent} ->
ok; %% FIXME is this the correct behavior?
{error, ErrorDesc} -> {error, ErrorDesc} ->
error_logger:error_msg("Error unloading sqlite3 driver: ~s~n", error_logger:error_msg("Error unloading sqlite3 driver: ~s~n",
[erl_ddll:format_error(ErrorDesc)]) [erl_ddll:format_error(ErrorDesc)])
end. end,
ok.
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
%% Func: code_change(OldVsn, State, Extra) -> {ok, NewState} %% Func: code_change(OldVsn, State, Extra) -> {ok, NewState}