fix field order in mail managers

[wolnelektury.git] / fabfile.py

diff --git a/fabfile.py b/fabfile.py
index bd685c6..11442c7 100644 (file)
--- a/fabfile.py
+++ b/fabfile.py
@@ -10,6 +10,28 @@ except ImportError:
 env.project_name = 'wolnelektury'
 
 
 env.project_name = 'wolnelektury'
 
 

+class ManageTask(Task):
+    def __init__(self, name, params='', **kwargs):
+        super(ManageTask, self).__init__(**kwargs)
+        self.name = name
+        self.params = params
+
+    def run(self):
+        require('app_path', 'project_name')
+        with cd(get_django_root_path('current')):
+            run('source %(ve)s/bin/activate && python manage.py %(task)s %(params)s' % {
+                've': env.ve,
+                'task': self.name,
+                'params': self.params,
+            }, pty=True)
+
+
+class Memcached(Service):
+    def run(self):
+        print '>>> memcached: restart'
+        sudo('/etc/init.d/memcached restart', shell=False)
+
+

 @task
 def production():
     env.hosts = ['giewont.icm.edu.pl']
 @task
 def production():
     env.hosts = ['giewont.icm.edu.pl']


@@ -17,26 +39,16 @@ def production():
     env.app_path = '/srv/wolnelektury.pl'
     env.django_root_path = 'src'
     env.requirements_file = 'requirements/requirements.txt'
     env.app_path = '/srv/wolnelektury.pl'
     env.django_root_path = 'src'
     env.requirements_file = 'requirements/requirements.txt'

+    env.pre_collectstatic = [
+        ManageTask('update_counters'),
+    ]

     env.services = [
         Supervisord('wolnelektury'),
         Supervisord('wolnelektury.celery'),
     env.services = [
         Supervisord('wolnelektury'),
         Supervisord('wolnelektury.celery'),

+        Memcached(),

     ]
 
 
     ]
 
 

-def update_counters():
-    print '>>> updating counters'
-    require('app_path', 'project_name')
-    with cd(get_django_root_path('current')):
-        run('%(ve)s/bin/python manage.py update_counters' % env, pty=True)
-
-
-def compile_messages():
-    print '>>> compiling messages'
-    require('app_path', 'project_name')
-    with cd(get_django_root_path('current')):
-        run('%(ve)s/bin/python manage.py localepack -c' % env, pty=True)
-
-

 @task
 def beta():
     env.hosts = ['giewont.icm.edu.pl']
 @task
 def beta():
     env.hosts = ['giewont.icm.edu.pl']


@@ -46,8 +58,7 @@ def beta():
     env.django_root_path = 'src'
     env.requirements_file = 'requirements/requirements.txt'
     env.pre_collectstatic = [
     env.django_root_path = 'src'
     env.requirements_file = 'requirements/requirements.txt'
     env.pre_collectstatic = [

-        update_counters,
-        compile_messages,
+        ManageTask('update_counters'),

     ]
     env.services = [
         Supervisord('beta'),
     ]
     env.services = [
         Supervisord('beta'),