From fa20190467f9f01ed6c7012d51508a6ec335bfaf Mon Sep 17 00:00:00 2001
From: Kelketek Rritaa <kelketek@gmail.com>
Date: Thu, 5 Jun 2014 19:17:10 -0500
Subject: [PATCH] Added collectstatic to start/reload.

---
 game/evennia.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/game/evennia.py b/game/evennia.py
index d1ed65fd69..998b078cb5 100755
--- a/game/evennia.py
+++ b/game/evennia.py
@@ -16,6 +16,8 @@ from optparse import OptionParser
 from subprocess import Popen
 
 # Set the Python path up so we can get to settings.py from here.
+from django.core import management
+
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 os.environ['DJANGO_SETTINGS_MODULE'] = 'game.settings'
 
@@ -264,6 +266,8 @@ def kill(pidfile, signal=SIG, succmsg="", errmsg="", restart_file=SERVER_RESTART
                 return
             os.remove(pidfile)
         # set restart/norestart flag
+        if restart == 'reload':
+            management.call_command('collectstatic', interactive=False, verbosity=0)
         f = open(restart_file, 'w')
         f.write(str(restart))
         f.close()
@@ -389,11 +393,13 @@ def handle_args(options, mode, service):
             if inter:
                 cmdstr.append('--iportal')
             cmdstr.append('--noserver')
+            management.call_command('collectstatic', verbosity=1, interactive=False)
         else:  # all
             # for convenience we don't start logging of
             # portal, only of server with this command.
             if inter:
                 cmdstr.extend(['--iserver'])
+            management.call_command('collectstatic', verbosity=1, interactive=False)
         return cmdstr
 
     elif mode == 'reload':
@@ -425,6 +431,7 @@ def handle_args(options, mode, service):
             kill(SERVER_PIDFILE, SIG, "Server stopped.", errmsg % 'Server', restart="shutdown")
     return None
 
+
 def error_check_python_modules():
     """
     Import settings modules in settings. This will raise exceptions on
@@ -509,7 +516,7 @@ def main():
     if mode not in ['menu', 'start', 'reload', 'stop']:
         print "mode should be none, 'menu', 'start', 'reload' or 'stop'."
         sys.exit()
-    if  service not in ['server', 'portal', 'all']:
+    if service not in ['server', 'portal', 'all']:
         print "service should be none, 'server', 'portal' or 'all'."
         sys.exit()