From d3735567a7e778a4216b6499693f91af4e158bd6 Mon Sep 17 00:00:00 2001 From: David Robakowski Date: Tue, 17 Dec 2013 17:11:46 +0100 Subject: [PATCH 1/2] Internal cancel return type tweak and deletion of unused code --- src/ecrn_app.erl | 4 +--- src/ecrn_control.erl | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/ecrn_app.erl b/src/ecrn_app.erl index 3d8a948..b163d6a 100644 --- a/src/ecrn_app.erl +++ b/src/ecrn_app.erl @@ -57,7 +57,5 @@ setup() -> erlcron:cron(CronJob) end, Crontab); undefined -> - ok; - Reason -> - error_logger:error_msg("Unknown crontab in configfile: ~p~n", [Reason]) + ok end. diff --git a/src/ecrn_control.erl b/src/ecrn_control.erl index 944428a..2b8ce60 100644 --- a/src/ecrn_control.erl +++ b/src/ecrn_control.erl @@ -112,5 +112,5 @@ internal_cancel(AlarmRef) -> undefined -> undefined; {ok, [Pid]} -> - {ok, ecrn_agent:cancel(Pid)} + ecrn_agent:cancel(Pid) end. From 61eb30d8e7f5f9d91f5af6d7a4ac18da64865dd4 Mon Sep 17 00:00:00 2001 From: David Robakowski Date: Wed, 18 Dec 2013 17:47:36 +0100 Subject: [PATCH 2/2] Spec tweaks for erlcron:cancel/1 --- src/ecrn_control.erl | 2 +- src/erlcron.erl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ecrn_control.erl b/src/ecrn_control.erl index 2b8ce60..a90d8a8 100644 --- a/src/ecrn_control.erl +++ b/src/ecrn_control.erl @@ -35,7 +35,7 @@ start_link() -> gen_server:start_link({local, ?SERVER}, ?MODULE, [], []). --spec cancel/1 :: (erlcron:job_ref()) -> ok. +-spec cancel/1 :: (erlcron:job_ref()) -> ok | undefined. cancel(AlarmRef) -> gen_server:call(?SERVER, {cancel, AlarmRef}). diff --git a/src/erlcron.erl b/src/erlcron.erl index 7b8ab51..5df40dd 100644 --- a/src/erlcron.erl +++ b/src/erlcron.erl @@ -90,7 +90,7 @@ once(When, Fun) -> %% @doc %% Cancel the job specified by the jobref. --spec cancel/1 :: (job_ref()) -> ok. +-spec cancel/1 :: (job_ref()) -> ok | undefined. cancel(JobRef) -> ecrn_control:cancel(JobRef).