diff -r 7df43b86c425 -r 6b79d5424407 sbin/sync/fabfile.py --- a/sbin/sync/fabfile.py Tue Dec 04 00:17:10 2012 +0100 +++ b/sbin/sync/fabfile.py Tue Dec 04 10:19:44 2012 +0100 @@ -1,22 +1,16 @@ from fabric.api import task, env, sudo from fabric.colors import green -from fabric.tasks import Task from ldt_fablib import (check_folder_access, syncdb, collectstatic, export_version, do_sync_web, create_config, clean_export_folder, do_sync_comp, sync_install_build, do_create_virtualenv, clean_rsync_folder, rsync_export, - get_comp_versions_dict) + get_comp_versions_dict, SyncComp, do_relaunch_server) import imp import os.path @task def relaunch_server(do_collectstatic=True, do_syncdb=True): print("Relaunch server") - check_folder_access() - if do_syncdb: - syncdb(env.remote_path['src'], env.remote_path['virtualenv']) - if do_collectstatic: - collectstatic(env.remote_path['src'], env.remote_path['virtualenv'], env.platform_web_module) - sudo(env.web_relaunch_cmd, shell=False) + do_relaunch_server(do_collectstatic, do_syncdb) @task def sync_web(version): @@ -83,29 +77,6 @@ if venv_remote_export_path: clean_rsync_folder(venv_remote_export_path) -class SyncComp(Task): - - def __init__(self, key): - self.key = key - - def __get_name(self): - return "sync_" + self.key - - name = property(__get_name) - - def run(self, version): - print(green("sync ldt with version %s" % version)) - export_path_web = export_version(web=version) - export_path_web_full = os.path.join(export_path_web,'web') - comp_versions = get_comp_versions_dict(export_path_web_full) - - export_path = export_version(**{self.key:comp_versions[self.key]}) - export_path_full = os.path.join(export_path,self.key) - do_sync_comp(self.key, export_path_full) - clean_export_folder(export_path) - clean_export_folder(export_path_web) - - relaunch_server() for sync_name in [key for key in env.repos if key != 'web']: globals()[sync_name] = SyncComp(sync_name)