refactor server file, removing callbacks

rindek · Oct 2, 2013 · 47caa19 · 47caa19
1 parent db51062
commit 47caa19
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 41 deletions.
diff --git a/core/server.rb b/core/server.rb
@@ -0,0 +1,19 @@
+require_relative "engine"
+
+class Rmud
+  class Server
+    def self.start!
+      Engine.instance.load_all
+      $boot_time = Time.now
+
+      EventMachine::run do
+        load_world ## :-(
+
+        server_config = read_config("game")[Rmud.env]
+        log_notice("[server.rb] - accepting connections on #{server_config["host"]}:#{server_config["port"]}")
+
+        EventMachine::start_server server_config["host"], server_config["port"], RmudConnector
+      end
+    end
+  end
+end
diff --git a/gamedriver/callbacks.rb b/gamedriver/callbacks.rb
diff --git a/gamedriver/callbacks/before_server_start.rb b/gamedriver/callbacks/before_server_start.rb
diff --git a/server.rb b/server.rb
@@ -1,23 +1,5 @@
 require './boot'
-require './core/engine'
-
-Engine.instance.load_all
-
-
-def autolog
-  true
-end
-
-EventMachine::run do
-  load_world ## :-(
-
-  server_config = read_config("game")[Rmud.env]
-  log_notice("[server.rb] - accepting connections on #{server_config["host"]}:#{server_config["port"]}")
-
-  Callbacks.execute(:before_server_start)
-
-  EventMachine::start_server server_config["host"], server_config["port"], RmudConnector
-end
+require './core/server'
 
+Rmud::Server.start!
 Kernel.exec("ruby server.rb") if $reboot
-