@@ -85,7 +85,8 @@ defmodule Phoenix.SessionProcess.ProcessSupervisor do
8585 # Automatically defines child_spec/1
8686 use DynamicSupervisor
8787
88- alias Phoenix.SessionProcess . { Error , Telemetry }
88+ alias Phoenix.SessionProcess . { Cleanup , Config , Error , Telemetry }
89+ alias Phoenix.SessionProcess.Registry , as: SessionRegistry
8990
9091 @ doc """
9192 Starts the process supervisor.
@@ -126,7 +127,7 @@ defmodule Phoenix.SessionProcess.ProcessSupervisor do
126127 """
127128 def start_child ( worker , worker_arg ) do
128129 worker_spec = { worker , worker_arg }
129- Phoenix.SessionProcess. Telemetry. emit_worker_start ( worker_spec )
130+ Telemetry . emit_worker_start ( worker_spec )
130131 DynamicSupervisor . start_child ( __MODULE__ , worker_spec )
131132 end
132133
@@ -143,7 +144,7 @@ defmodule Phoenix.SessionProcess.ProcessSupervisor do
143144 - `{:error, reason}` - Failed to terminate child process
144145 """
145146 def terminate_child ( pid ) do
146- Phoenix.SessionProcess. Telemetry. emit_worker_terminate ( pid )
147+ Telemetry . emit_worker_terminate ( pid )
147148 DynamicSupervisor . terminate_child ( __MODULE__ , pid )
148149 end
149150
@@ -176,7 +177,7 @@ defmodule Phoenix.SessionProcess.ProcessSupervisor do
176177 - `{:error, reason}` - Failed to start session process
177178 """
178179 def start_session ( session_id ) do
179- start_session_with_module ( session_id , Phoenix.SessionProcess. Config. session_process ( ) )
180+ start_session_with_module ( session_id , Config . session_process ( ) )
180181 end
181182
182183 @ doc """
@@ -255,7 +256,7 @@ defmodule Phoenix.SessionProcess.ProcessSupervisor do
255256 """
256257 @ spec terminate_session ( binary ( ) ) :: :ok | { :error , :not_found }
257258 def terminate_session ( session_id ) do
258- Phoenix.SessionProcess. Telemetry. emit_session_end_event ( session_id )
259+ Telemetry . emit_session_end_event ( session_id )
259260 start_time = System . monotonic_time ( )
260261
261262 case session_process_pid ( session_id ) do
@@ -338,14 +339,14 @@ defmodule Phoenix.SessionProcess.ProcessSupervisor do
338339 Error . cast_failed ( module , :cast , { request } , reason )
339340 end
340341
341- @ spec child_name ( binary ( ) ) :: { :via , Registry , { Phoenix.SessionProcess.Registry , binary ( ) } }
342+ @ spec child_name ( binary ( ) ) :: { :via , Registry , { SessionRegistry , binary ( ) } }
342343 def child_name ( session_id ) do
343- { :via , Registry , { Phoenix.SessionProcess.Registry , session_id } }
344+ { :via , Registry , { SessionRegistry , session_id } }
344345 end
345346
346347 @ spec session_process_pid ( binary ( ) ) :: nil | pid ( )
347348 def session_process_pid ( session_id ) do
348- case Registry . whereis_name ( { Phoenix.SessionProcess.Registry , session_id } ) do
349+ case Registry . whereis_name ( { SessionRegistry , session_id } ) do
349350 :undefined -> nil
350351 pid -> pid
351352 end
@@ -356,7 +357,7 @@ defmodule Phoenix.SessionProcess.ProcessSupervisor do
356357
357358 with :ok <- validate_session_id ( session_id ) ,
358359 :ok <- check_session_limits ( ) do
359- Phoenix.SessionProcess. Telemetry. emit_session_start_event ( session_id )
360+ Telemetry . emit_session_start_event ( session_id )
360361
361362 worker_args =
362363 if arg , do: [ name: child_name ( session_id ) , arg: arg ] , else: [ name: child_name ( session_id ) ]
@@ -365,15 +366,15 @@ defmodule Phoenix.SessionProcess.ProcessSupervisor do
365366
366367 case DynamicSupervisor . start_child ( __MODULE__ , spec ) do
367368 { :ok , pid } = result ->
368- Registry . register ( Phoenix.SessionProcess.Registry , pid , module )
369- Phoenix.SessionProcess. Cleanup. schedule_session_cleanup ( session_id )
369+ Registry . register ( SessionRegistry , pid , module )
370+ Cleanup . schedule_session_cleanup ( session_id )
370371 duration = System . monotonic_time ( ) - start_time
371372 Telemetry . emit_session_start ( session_id , module , pid , duration: duration )
372373 result
373374
374375 { :ok , pid , _info } = result ->
375- Registry . register ( Phoenix.SessionProcess.Registry , pid , module )
376- Phoenix.SessionProcess. Cleanup. schedule_session_cleanup ( session_id )
376+ Registry . register ( SessionRegistry , pid , module )
377+ Cleanup . schedule_session_cleanup ( session_id )
377378 duration = System . monotonic_time ( ) - start_time
378379 Telemetry . emit_session_start ( session_id , module , pid , duration: duration )
379380 result
@@ -399,7 +400,7 @@ defmodule Phoenix.SessionProcess.ProcessSupervisor do
399400 Error . invalid_session_id ( session_id )
400401
401402 { :error , :session_limit_reached } ->
402- max_sessions = Phoenix.SessionProcess. Config. max_sessions ( )
403+ max_sessions = Config . max_sessions ( )
403404 duration = System . monotonic_time ( ) - start_time
404405
405406 Telemetry . emit_session_start_error (
@@ -414,23 +415,23 @@ defmodule Phoenix.SessionProcess.ProcessSupervisor do
414415 end
415416
416417 defp get_session_module ( pid ) do
417- case Registry . lookup ( Phoenix.SessionProcess.Registry , pid ) do
418+ case Registry . lookup ( SessionRegistry , pid ) do
418419 [ { _ , module } ] -> module
419- _ -> Phoenix.SessionProcess. Config. session_process ( )
420+ _ -> Config . session_process ( )
420421 end
421422 end
422423
423424 defp validate_session_id ( session_id ) do
424- if Phoenix.SessionProcess. Config. valid_session_id? ( session_id ) do
425+ if Config . valid_session_id? ( session_id ) do
425426 :ok
426427 else
427428 { :error , :invalid_session_id }
428429 end
429430 end
430431
431432 defp check_session_limits do
432- max_sessions = Phoenix.SessionProcess. Config. max_sessions ( )
433- current_sessions = Registry . count ( Phoenix.SessionProcess.Registry )
433+ max_sessions = Config . max_sessions ( )
434+ current_sessions = Registry . count ( SessionRegistry )
434435
435436 if current_sessions < max_sessions do
436437 :ok
0 commit comments