From 9e06407b007eeaff323b78df30d384d27299c094 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?=
Date: Sat, 14 Jul 2018 14:37:51 +0200
Subject: [PATCH] Use new timeunits
---
lib/plug/logger.ex | 2 +-
lib/plug/request_id.ex | 2 +-
lib/plug/upload.ex | 2 +-
mix.exs | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/plug/logger.ex b/lib/plug/logger.ex
index c4ab109b..69d20718 100644
--- a/lib/plug/logger.ex
+++ b/lib/plug/logger.ex
@@ -33,7 +33,7 @@ defmodule Plug.Logger do
Conn.register_before_send(conn, fn conn ->
Logger.log(level, fn ->
stop = System.monotonic_time()
- diff = System.convert_time_unit(stop - start, :native, :micro_seconds)
+ diff = System.convert_time_unit(stop - start, :native, :microsecond)
status = Integer.to_string(conn.status)
[connection_type(conn), ?\s, status, " in ", formatted_diff(diff)]
diff --git a/lib/plug/request_id.ex b/lib/plug/request_id.ex
index e31b22a4..431318a2 100644
--- a/lib/plug/request_id.ex
+++ b/lib/plug/request_id.ex
@@ -57,7 +57,7 @@ defmodule Plug.RequestId do
defp generate_request_id do
binary = <<
- System.system_time(:nanoseconds)::64,
+ System.system_time(:nanosecond)::64,
:erlang.phash2({node(), self()}, 16_777_216)::24,
:erlang.unique_integer()::32
>>
diff --git a/lib/plug/upload.ex b/lib/plug/upload.ex
index cc538360..4b21f90e 100644
--- a/lib/plug/upload.ex
+++ b/lib/plug/upload.ex
@@ -100,7 +100,7 @@ defmodule Plug.Upload do
end
defp path(prefix, tmp) do
- sec = :os.system_time(:seconds)
+ sec = :os.system_time(:second)
rand = :rand.uniform(999_999_999_999_999)
scheduler_id = :erlang.system_info(:scheduler_id)
tmp <> "/" <> prefix <> "-" <> i(sec) <> "-" <> i(rand) <> "-" <> i(scheduler_id)
diff --git a/mix.exs b/mix.exs
index a600edd9..6fd39063 100644
--- a/mix.exs
+++ b/mix.exs
@@ -1,7 +1,7 @@
defmodule Plug.MixProject do
use Mix.Project
- @version "1.6.1"
+ @version "1.7.0-dev"
@description "A specification and conveniences for composable modules between web applications"
@xref_exclude [:ranch, :cowboy, :cowboy_req, :cowboy_router, :cowboy_stream, :cowboy_stream_h]
@@ -9,7 +9,7 @@ defmodule Plug.MixProject do
[
app: :plug,
version: @version,
- elixir: "~> 1.3",
+ elixir: "~> 1.4",
deps: deps(),
package: package(),
lockfile: lockfile(),