File 0006-replace-erlang-now-0-and-erlang-timestamp-... of Package cpg

Overview Repositories Revisions Requests Users Attributes Meta

File 0006-replace-erlang-now-0-and-erlang-timestamp-0-to-os-ti.patch of Package cpg (Revision b91f913ba10a8c06c157f5228c5abfc4)

Currently displaying revision b91f913ba10a8c06c157f5228c5abfc4 , Show latest

From 539f74bdcb041f4ce6873d6324400c2207107edb Mon Sep 17 00:00:00 2001
From: Led <ledest@gmail.com>
Date: Sun, 24 Sep 2017 18:29:28 +0300
Subject: [PATCH 1/2] replace erlang:now/0 and erlang:timestamp/0 to
 os:timestamp/0

---
 rebar.config                 |  4 +---
 src/supervisor_cpg_spawn.erl | 17 +----------------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/rebar.config b/rebar.config
index 98cff6d..530ec4e 100644
--- a/rebar.config
+++ b/rebar.config
@@ -6,9 +6,7 @@
 
 {require_otp_vsn, "19|20"}.
 {erl_opts,
- [{platform_define, "^19\.", 'ERLANG_OTP_VERSION_19'},
-  {platform_define, "^20\.", 'ERLANG_OTP_VERSION_20'},
-  warnings_as_errors,
+ [warnings_as_errors,
   strict_validation,
   warn_bif_clash,
   warn_deprecated_function,
diff --git a/src/supervisor_cpg_spawn.erl b/src/supervisor_cpg_spawn.erl
index e41211e..ca7c261 100644
--- a/src/supervisor_cpg_spawn.erl
+++ b/src/supervisor_cpg_spawn.erl
@@ -332,7 +332,7 @@ nomad_restart(_Reason,
                            restarts = Restarts,
                            max_r = MaxR,
                            max_t = MaxT} = NomadState) ->
-    Now = timestamp(),
+    Now = os:timestamp(),
     NewRestarts = lists:dropwhile(fun(T) ->
         timer:now_diff(Now, T) / 1000000 > MaxT
     end, Restarts) ++ [Now],
@@ -367,18 +367,3 @@ extract_child(#state_nomad{pid = Pid,
      {restart_type, Restart},
      {shutdown, Shutdown},
      {child_type, Type}].
-
--spec timestamp() -> erlang:timestamp().
-
--ifdef(ERLANG_OTP_VERSION_16).
-timestamp() ->
-    erlang:now().
--else.
--ifdef(ERLANG_OTP_VERSION_17).
-timestamp() ->
-    erlang:now().
--else. % necessary for Erlang >= 18.0
-timestamp() ->
-    erlang:timestamp().
--endif.
--endif.
-- 
2.14.1

Places

File 0006-replace-erlang-now-0-and-erlang-timestamp-0-to-os-ti.patch of Package cpg (Revision b91f913ba10a8c06c157f5228c5abfc4)

Places