Changeset 1414 for branches/locker-dev/locker/deploy/bin/django

Timestamp:

Jan 12, 2010, 11:55:27 PM (14 years ago)

Author:

ezyang

Message:

Merged in changes from trunk

--- Merging r1262 through r1413 into 'deploy/bin':
U    deploy/bin/django
   C deploy/bin/rails
   > Resolved by accepting working copy
--- Merging r1221 through r1413 into '.':
U    sql/bin/get-password
U    sql/bin/save-password
U    doc/tickets/rt.txt
U    doc/tickets/cnames.txt
U    bin/fix-php-ini
   C bin/scripts-rails
   > Resolved by accepting working copy
Skipped 'bin/for-each-server'
 U   bin
U    sbin/parallel-find.pl
U    sbin/commit-email.pl
U    sbin/commit-zephyr
Summary of conflicts:
  Tree conflicts: 2
  Skipped paths: 1

Location:

branches/locker-dev/locker

Files:

• . (modified) (1 prop)
• deploy/bin (modified) (1 prop)
• deploy/bin/django (modified) (4 diffs)

branches/locker-dev/locker/deploy/bin/django

@@ -16 +16 @@
 print FASTCGI <<EOF;
 #!/usr/bin/env python
-import sys, os
+import sys, os, time, threading, django.utils.autoreload
 sys.path.insert(0, "/mit/$USER/Scripts/django")
 os.chdir("/mit/$USER/Scripts/django/$name")
 os.environ['DJANGO_SETTINGS_MODULE'] = "$name.settings"
+
+def reloader_thread():
+  while True:
+    if django.utils.autoreload.code_changed():
+      os._exit(3)
+    time.sleep(1)
+t = threading.Thread(target=reloader_thread)
+t.daemon = True
+t.start()
 
 from django.core.servers.fastcgi import runfastcgi
@@ -38 +47 @@
 
 chdir "/mit/$USER/Scripts/django/";
-system qw{django-admin.py startproject}, $name;
+system qw{django-admin startproject}, $name;
 chdir "$name";
 
@@ -65 +74 @@
     while (<SETTINGS>) {
       if (/^\)/) {
-        print NEWSETTINGS "    'django.contrib.admin',\n";
-        print NEWSETTINGS "    'django.contrib.admindocs',\n";
+        print NEWSETTINGS "    'django.contrib.admin',\n";
+        print NEWSETTINGS "    'django.contrib.admindocs',\n";
       }
       print NEWSETTINGS $_;
@@ -114 +123 @@
 print "  /mit/$USER/Scripts/django/$name/\n";
 print "To access manage.py, run 'ssh -k $USER\@scripts' and cd to the above directory.\n\n";
-print "When you edit your code, run the command\n";
-print "  touch /mit/$USER/web_scripts/$addrend/index.fcgi\n";
-print "before testing, to cause your site to reload the new code.\n";
 press_enter;