Merge pull request #26 from synlay/feature/erlcron_cancel_fix

Wrong return type for ecrn_control:internal_cancel/1
erlware · Jan 8, 2014 · 40a022d · 40a022d
2 parents 2ebd2de + 61eb30d
commit 40a022d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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}).
 
@@ -112,5 +112,5 @@ internal_cancel(AlarmRef) ->
         undefined ->
             undefined;
         {ok, [Pid]} ->
-            {ok, ecrn_agent:cancel(Pid)}
+            ecrn_agent:cancel(Pid)
     end.
diff --git 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).