diff options
| author | Linus Nordberg <linus@sunet.se> | 2019-07-01 10:00:20 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@sunet.se> | 2019-07-01 10:00:20 +0200 |
| commit | 7db7c1d9d2b592bf416524049f6f344fe3334a16 (patch) | |
| tree | c028b6b949c18b75b61d9f9e49d1a562f00f6f88 | |
| parent | 381b876a6bc7b669d1eab72e14b9f6a106980099 (diff) | |
remove some FIXME:s
| -rw-r--r-- | p11p-daemon/src/p11p_config.erl | 2 | ||||
| -rw-r--r-- | p11p-daemon/src/p11p_remote_manager.erl | 11 | ||||
| -rw-r--r-- | p11p-daemon/src/p11p_server.erl | 2 | ||||
| -rw-r--r-- | p11p-daemon/src/p11p_server_sup.erl | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/p11p-daemon/src/p11p_config.erl b/p11p-daemon/src/p11p_config.erl index c9ada5f..a8fde91 100644 --- a/p11p-daemon/src/p11p_config.erl +++ b/p11p-daemon/src/p11p_config.erl @@ -15,7 +15,7 @@ %% Records and types. -record(p11module, { name :: string(), - path :: string() %FIXME: filename + path :: string() }). -type p11module() :: #p11module{}. diff --git a/p11p-daemon/src/p11p_remote_manager.erl b/p11p-daemon/src/p11p_remote_manager.erl index 74f035b..0acec66 100644 --- a/p11p-daemon/src/p11p_remote_manager.erl +++ b/p11p-daemon/src/p11p_remote_manager.erl @@ -35,13 +35,13 @@ -record(remote, { tokname :: string(), servid :: atom(), - modpath :: string(), % FIXME: filename - pid = undefined :: pid() | undefined + modpath :: string(), + pid :: pid() | undefined }). -record(token, { - remotes :: [#remote{}], % Active remote in hd(). - replay = <<>> :: binary() + remotes :: [#remote{}], % Active remote in hd(). + replay = <<>> :: binary() % FIXME: seems unfeasable, remove }). -record(state, { @@ -80,8 +80,9 @@ handle_call({remote_for_token, TokName}, _From, #state{tokens = Tokens} = State) _ -> {reply, Pid, State} end; -handle_call({server_event, timeout, [TokName]}, _From, #state{tokens = Tokens} = State) -> +handle_call({server_event, timeout, [TokName, Server]}, _From, #state{tokens = Tokens} = State) -> lager:debug("~p: ~s: timed out", [self(), TokName]), + gen_server:stop(Server), % Hang up p11 client. %% TODO: do some code dedup with remote_for_token? #{TokName := Token} = Tokens, Remotes = Token#token.remotes, diff --git a/p11p-daemon/src/p11p_server.erl b/p11p-daemon/src/p11p_server.erl index 733ce6f..52e5a4c 100644 --- a/p11p-daemon/src/p11p_server.erl +++ b/p11p-daemon/src/p11p_server.erl @@ -18,7 +18,7 @@ -record(state, { tokname :: string(), remote :: pid() | undefined, - sockpath :: string(), % FIXME: filename(3erl) + sockpath :: string(), socket :: gen_tcp:socket(), msg :: p11rpc_msg() | undefined, clientbuf = <<>> :: binary() diff --git a/p11p-daemon/src/p11p_server_sup.erl b/p11p-daemon/src/p11p_server_sup.erl index 7ffa3d6..53d6f01 100644 --- a/p11p-daemon/src/p11p_server_sup.erl +++ b/p11p-daemon/src/p11p_server_sup.erl @@ -54,4 +54,4 @@ mkdir_socket_basepath() -> -spec socket_path(string(), string()) -> string(). socket_path(BasePath, Name) -> - BasePath ++ Name ++ "-" ++ os:getpid(). % FIXME: filename(3erl) + BasePath ++ Name ++ "-" ++ os:getpid(). |