Merge pull request #709 from celluloid/698-remove-default-at_exit-han…

…dler Fix autostart.
celluloid · Apr 3, 2016 · a6f1221 · a6f1221
2 parents c54bbde + 07c5005
commit a6f1221
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/lib/celluloid.rb b/lib/celluloid.rb
@@ -531,7 +531,3 @@ def future(meth = nil, *args, &block)
     end
   end
 
-unless defined?($CELLULOID_TEST) && $CELLULOID_TEST
-  Celluloid.register_shutdown
-  Celluloid.init
-end
diff --git a/lib/celluloid/autostart.rb b/lib/celluloid/autostart.rb
@@ -1,3 +1,8 @@
 require "celluloid"
 
 Celluloid.start
+
+unless defined?($CELLULOID_TEST) && $CELLULOID_TEST
+  Celluloid.register_shutdown
+  Celluloid.init
+end
diff --git a/lib/celluloid/current.rb b/lib/celluloid/current.rb
@@ -1,2 +1,2 @@
 $CELLULOID_BACKPORTED = false
-require "celluloid/autostart"
+require "celluloid"