Finish moving things from IRC. to Nola., refs T77

2 files changed, 10 insertions, 8 deletions

diff --git a/lib/irc/nola_irc.ex b/lib/irc/nola_irc.ex
index 7e23f50..4ed94d1 100644
--- a/lib/irc/nola_irc.ex
+++ b/lib/irc/nola_irc.ex
@@ -8,15 +8,9 @@ defmodule Nola.IRC do
     import Supervisor.Spec
 
     IRC.Connection.setup()
-    Nola.Plugins.setup()
 
     [
       worker(Registry, [[keys: :duplicate, name: IRC.ConnectionPubSub]], id: :registr_irc_conn),
-      worker(Nola.Membership, []),
-      worker(Nola.Account, []),
-      worker(IRC.UserTrack.Storage, []),
-      worker(Nola.Plugins.Account, []),
-      supervisor(Nola.Plugins.Supervisor, [], [name: Nola.Plugins.Supervisor]),
       supervisor(IRC.Connection.Supervisor, [], [name: IRC.Connection.Supervisor]),
       supervisor(IRC.PuppetConnection.Supervisor, [], [name: IRC.PuppetConnection.Supervisor]),
     ]
@@ -24,8 +18,6 @@ defmodule Nola.IRC do
 
   # Start plugins first to let them get on connection events.
   def after_start() do
-    Logger.info("Starting plugins")
-    Nola.Plugins.start_all()
     Logger.info("Starting connections")
     IRC.Connection.start_all()
   end
diff --git a/lib/nola/application.ex b/lib/nola/application.ex
index 53ca439..fa880ea 100644
--- a/lib/nola/application.ex
+++ b/lib/nola/application.ex
@@ -5,6 +5,9 @@ defmodule Nola.Application do
     import Supervisor.Spec
 
     Logger.add_backend(Sentry.LoggerBackend)
+
+    Nola.Plugins.setup()
+
     :ok = Nola.Matrix.setup()
     :ok = Nola.TelegramRoom.setup()
 
@@ -18,12 +21,19 @@ defmodule Nola.Application do
       Nola.Subnet,
       {GenMagic.Pool, [name: Nola.GenMagic, pool_size: 2]},
       worker(Registry, [[keys: :duplicate, name: Nola.PubSub]], id: :registry_nola_pubsub),
+      worker(Nola.Membership, []),
+      worker(Nola.Account, []),
+      worker(Nola.UserTrack.Storage, []),
+      worker(Nola.Plugins.Account, []),
+      supervisor(Nola.Plugins.Supervisor, [], [name: Nola.Plugins.Supervisor]),
     ] ++ Nola.IRC.application_childs
       ++ Nola.Matrix.application_childs
 
     opts = [strategy: :one_for_one, name: Nola.Supervisor]
     sup = Supervisor.start_link(children, opts)
+    
     start_telegram()
+    Nola.Plugins.start_all()
     spawn_link(fn() -> Nola.IRC.after_start() end)
     spawn_link(fn() -> Nola.Matrix.after_start() end)
     spawn_link(fn() -> Nola.TelegramRoom.after_start() end)