graham/aprs.me
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

deployed at fix

Browse source
This commit is contained in:
Graham McIntire 2025-06-21 22:13:56 -05:00
parent d2ec835fdd
commit 2a98013a96
No known key found for this signature in database
3 changed files with 77 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -54,7 +54,7 @@ RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
ENV LANG="en_US.UTF-8" LANGUAGE="en_US:en" LC_ALL="en_US.UTF-8"
# Set deployment timestamp to current time during build
ENV DEPLOYED_AT=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
RUN date -u +"%Y-%m-%dT%H:%M:%SZ" > /app/deployed_at.txt
# Set working directory
WORKDIR "/app"

45
lib/aprs/release.ex
View file

@ -6,11 +6,13 @@ defmodule Aprs.Release do
@app :aprs
def migrate do
load_app()
# Initialize deployment timestamp first
deployed_at = init()
require Logger
Logger.info("Deployment timestamp: #{deployed_at}")
for repo <- repos() do
{:ok, _, _} = Ecto.Migrator.with_repo(repo, &Ecto.Migrator.run(&1, :up, all: true))
end
# Run migrations
{:ok, _, _} = Ecto.Migrator.with_repo(Aprs.Repo, &Ecto.Migrator.run(&1, :up, all: true))
end
def rollback(repo, version) do
@ -25,4 +27,39 @@ defmodule Aprs.Release do
defp load_app do
Application.load(@app)
end
@doc """
Initialize release-specific configuration.
This is called during application startup.
"""
def init do
# Read deployment timestamp from file
deployed_at = read_deployment_timestamp()
# Add to application config
Application.put_env(:aprs, :deployed_at, deployed_at)
deployed_at
end
@doc """
Get the deployment timestamp.
"""
def deployed_at do
Application.get_env(:aprs, :deployed_at) || DateTime.utc_now()
end
defp read_deployment_timestamp do
case File.read("/app/deployed_at.txt") do
{:ok, timestamp} ->
case DateTime.from_iso8601(String.trim(timestamp)) do
{:ok, datetime, _} -> datetime
_ -> DateTime.utc_now()
end
_ ->
# Fallback to current time if file doesn't exist
DateTime.utc_now()
end
end
end

65
lib/aprs_web/live/map_live/index.ex
View file

@ -26,19 +26,8 @@ defmodule AprsWeb.MapLive.Index do
Process.send_after(self(), :cleanup_old_packets, 60_000)
end
# Get deployment timestamp from environment variable or use current time as fallback
deployed_at =
case System.get_env("DEPLOYED_AT") do
nil ->
# Fallback to current time if not set
DateTime.utc_now()
timestamp when is_binary(timestamp) ->
case DateTime.from_iso8601(timestamp) do
{:ok, datetime, _} -> datetime
_ -> DateTime.utc_now()
end
end
# Get deployment timestamp from config (set during application startup)
deployed_at = Aprs.Release.deployed_at()
one_hour_ago = DateTime.add(DateTime.utc_now(), -3600, :second)
@ -154,14 +143,18 @@ defmodule AprsWeb.MapLive.Index do
@impl true
def handle_event("bounds_changed", %{"bounds" => bounds}, socket) do
Logger.debug("handle_event bounds_changed: #{inspect(bounds)} vs current #{inspect(socket.assigns.map_bounds)}")
Logger.debug(
"handle_event bounds_changed: #{inspect(bounds)} vs current #{inspect(socket.assigns.map_bounds)}"
)
handle_bounds_update(bounds, socket)
end
@impl true
def handle_event("update_bounds", %{"bounds" => bounds}, socket) do
Logger.debug("handle_event update_bounds: #{inspect(bounds)} vs current #{inspect(socket.assigns.map_bounds)}")
Logger.debug(
"handle_event update_bounds: #{inspect(bounds)} vs current #{inspect(socket.assigns.map_bounds)}"
)
handle_bounds_update(bounds, socket)
end
@ -325,7 +318,9 @@ defmodule AprsWeb.MapLive.Index do
west: bounds["west"]
}
Logger.debug("handle_bounds_update: new #{inspect(map_bounds)} vs current #{inspect(socket.assigns.map_bounds)}")
Logger.debug(
"handle_bounds_update: new #{inspect(map_bounds)} vs current #{inspect(socket.assigns.map_bounds)}"
)
# Validate bounds to prevent invalid coordinates
if map_bounds.north > 90 or map_bounds.south < -90 or
@ -351,7 +346,9 @@ defmodule AprsWeb.MapLive.Index do
@spec process_bounds_update(map(), Socket.t()) :: Socket.t()
defp process_bounds_update(map_bounds, socket) do
Logger.debug("process_bounds_update: Loading historical packets for bounds #{inspect(map_bounds)}")
Logger.debug(
"process_bounds_update: Loading historical packets for bounds #{inspect(map_bounds)}"
)
# Remove out-of-bounds packets and markers immediately
new_visible_packets =
@ -385,22 +382,30 @@ defmodule AprsWeb.MapLive.Index do
end
@impl true
def handle_info({:process_bounds_update, map_bounds}, socket), do: handle_info_process_bounds_update(map_bounds, socket)
def handle_info({:process_bounds_update, map_bounds}, socket),
do: handle_info_process_bounds_update(map_bounds, socket)
def handle_info({:delayed_zoom, %{lat: lat, lng: lng}}, socket), do: handle_info_delayed_zoom(lat, lng, socket)
def handle_info({:delayed_zoom, %{lat: lat, lng: lng}}, socket),
do: handle_info_delayed_zoom(lat, lng, socket)
def handle_info({:ip_location, %{lat: lat, lng: lng}}, socket), do: handle_info_ip_location(lat, lng, socket)
def handle_info({:ip_location, %{lat: lat, lng: lng}}, socket),
do: handle_info_ip_location(lat, lng, socket)
def handle_info(:initialize_replay, socket), do: handle_info_initialize_replay(socket)
def handle_info(:cleanup_old_packets, socket), do: handle_cleanup_old_packets(socket)
def handle_info(:reload_historical_packets, socket), do: handle_reload_historical_packets(socket)
def handle_info(:reload_historical_packets, socket),
do: handle_reload_historical_packets(socket)
def handle_info({:postgres_packet, packet}, socket), do: handle_info_postgres_packet(packet, socket)
def handle_info({:postgres_packet, packet}, socket),
do: handle_info_postgres_packet(packet, socket)
def handle_info(%Phoenix.Socket.Broadcast{topic: "aprs_messages", event: "packet", payload: packet}, socket),
do: handle_info({:postgres_packet, packet}, socket)
def handle_info(
%Phoenix.Socket.Broadcast{topic: "aprs_messages", event: "packet", payload: packet},
socket
),
do: handle_info({:postgres_packet, packet}, socket)
# Private handler functions for each message type
@ -748,7 +753,7 @@ defmodule AprsWeb.MapLive.Index do
</svg>
<h2 class="text-xl font-bold">APRS.me</h2>
</div>
<!-- Close button for mobile -->
<button
class="lg:hidden text-white hover:text-slate-200 transition-colors"
@ -771,7 +776,7 @@ defmodule AprsWeb.MapLive.Index do
</svg>
</button>
</div>
<!-- Content -->
<div class="p-6 space-y-6 bg-slate-50 flex-1 overflow-y-auto">
<!-- Callsign Search -->
@ -804,7 +809,7 @@ defmodule AprsWeb.MapLive.Index do
</button>
</form>
</div>
<!-- Trail Duration -->
<div class="space-y-4">
<label class="block text-sm font-semibold text-slate-700 flex items-center space-x-2">
@ -863,7 +868,7 @@ defmodule AprsWeb.MapLive.Index do
<span>How long should position trails be displayed</span>
</p>
</div>
<!-- Historical Data -->
<div class="space-y-4">
<label class="block text-sm font-semibold text-slate-700 flex items-center space-x-2">
@ -916,7 +921,7 @@ defmodule AprsWeb.MapLive.Index do
<span>How many hours of historical packets to load</span>
</p>
</div>
<!-- Navigation Links (Mobile) -->
<div class="lg:hidden pt-4 border-t border-slate-200 space-y-3">
<.link
@ -948,7 +953,7 @@ defmodule AprsWeb.MapLive.Index do
<span>View Bad Packets</span>
</.link>
</div>
<!-- Deployment Information -->
<div class="pt-4 border-t border-slate-200 space-y-3">
<div class="flex items-center space-x-2 text-sm text-slate-600">