Mercurial > kallithea
changeset 435:0e8ef6f17203
Merge with bd3f341cad457c5106bb16170ffac5c894f8e841
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Fri, 27 Aug 2010 22:28:50 +0200 |
| parents | 01cf2c9bd7ee (current diff) bd3f341cad45 (diff) |
| children | 28f19fa562df |
| files | |
| diffstat | 3 files changed, 46 insertions(+), 47 deletions(-) [+] |
line wrap: on
line diff
--- a/hg_app_daemon Thu Aug 26 22:40:53 2010 +0200 +++ b/hg_app_daemon Fri Aug 27 22:28:50 2010 +0200 @@ -33,8 +33,8 @@ start() { ebegin "Starting $APP_NAME" - cd $APP_PATH - start-stop-daemon --start --quiet\ + start-stop-daemon -d $APP_PATH -e PYTHON_EGG_CACHE="/tmp" \ + --start --quiet \ --pidfile $PID_PATH \ --user $RUN_AS \ --exec $DAEMON -- $DAEMON_OPTS @@ -43,7 +43,8 @@ stop() { ebegin "Stopping $APP_NAME" - start-stop-daemon --stop --quiet \ + start-stop-daemon -d $APP_PATH \ + --stop --quiet \ --pidfile $PID_PATH || echo "$APP_NAME - Not running!" if [ -f $PID_PATH ]; then rm $PID_PATH
--- a/hg_app_daemon2 Thu Aug 26 22:40:53 2010 +0200 +++ b/hg_app_daemon2 Fri Aug 27 22:28:50 2010 +0200 @@ -38,15 +38,16 @@ case "$1" in start) echo "Starting $APP_NAME" - cd $APP_PATH - start-stop-daemon --start --quiet\ + start-stop-daemon -d $APP_PATH -e PYTHON_EGG_CACHE="/tmp" \ + --start --quiet \ --pidfile $PID_PATH \ --user $RUN_AS \ --exec $DAEMON -- $DAEMON_OPTS ;; stop) echo "Stopping $APP_NAME" - start-stop-daemon --stop --quiet \ + start-stop-daemon -d $APP_PATH \ + --stop --quiet \ --pidfile $PID_PATH || echo "$APP_NAME - Not running!" if [ -f $PID_PATH ]; then rm $PID_PATH @@ -54,17 +55,21 @@ ;; restart) echo "Restarting $APP_NAME" - #stop - start-stop-daemon --stop --quiet \ + ### stop ### + echo "Stopping $APP_NAME" + start-stop-daemon -d $APP_PATH \ + --stop --quiet \ --pidfile $PID_PATH || echo "$APP_NAME - Not running!" if [ -f $PID_PATH ]; then rm $PID_PATH fi - #start - start-stop-daemon --start --quiet\ + ### start ### + echo "Starting $APP_NAME" + start-stop-daemon -d $APP_PATH -e PYTHON_EGG_CACHE="/tmp" \ + --start --quiet \ --pidfile $PID_PATH \ --user $RUN_AS \ - --exec $DAEMON -- $DAEMON_OPTS + --exec $DAEMON -- $DAEMON_OPTS ;; *) echo "Usage: $0 {start|stop|restart}"
--- a/pylons_app/lib/backup_manager.py Thu Aug 26 22:40:53 2010 +0200 +++ b/pylons_app/lib/backup_manager.py Fri Aug 27 22:28:50 2010 +0200 @@ -26,7 +26,6 @@ import logging -from mercurial import config import tarfile import os import datetime @@ -36,44 +35,32 @@ format="%(asctime)s %(levelname)-5.5s %(message)s") class BackupManager(object): - def __init__(self, id_rsa_path, repo_conf): - self.repos_path = None - self.backup_file_name = None - self.id_rsa_path = id_rsa_path - self.check_id_rsa() - cur_dir = os.path.realpath(__file__) - dn = os.path.dirname - self.backup_file_path = os.path.join(dn(dn(dn(cur_dir))), 'data') - cfg = config.config() - try: - cfg.read(os.path.join(dn(dn(dn(cur_dir))), repo_conf)) - except IOError: - logging.error('Could not read %s', repo_conf) - sys.exit() - self.set_repos_path(cfg.items('paths')) + def __init__(self, repos_location, rsa_key, backup_server): + today = datetime.datetime.now().weekday() + 1 + self.backup_file_name = "mercurial_repos.%s.tar.gz" % today + + self.id_rsa_path = self.get_id_rsa(rsa_key) + self.repos_path = self.get_repos_path(repos_location) + self.backup_server = backup_server + + self.backup_file_path = '/tmp' + logging.info('starting backup for %s', self.repos_path) logging.info('backup target %s', self.backup_file_path) - if not os.path.isdir(self.repos_path): - raise Exception('Not a valid directory in %s' % self.repos_path) - def check_id_rsa(self): - if not os.path.isfile(self.id_rsa_path): - logging.error('Could not load id_rsa key file in %s', - self.id_rsa_path) + def get_id_rsa(self, rsa_key): + if not os.path.isfile(rsa_key): + logging.error('Could not load id_rsa key file in %s', rsa_key) sys.exit() - def set_repos_path(self, paths): - repos_path = paths[0][1].split('/') - if repos_path[-1] in ['*', '**']: - repos_path = repos_path[:-1] - if repos_path[0] != '/': - repos_path[0] = '/' - self.repos_path = os.path.join(*repos_path) + def get_repos_path(self, path): + if not os.path.isdir(path): + logging.error('Wrong location for repositories in %s', path) + sys.exit() + return path def backup_repos(self): - today = datetime.datetime.now().weekday() + 1 - self.backup_file_name = "mercurial_repos.%s.tar.gz" % today bckp_file = os.path.join(self.backup_file_path, self.backup_file_name) tar = tarfile.open(bckp_file, "w:gz") @@ -88,12 +75,13 @@ def transfer_files(self): params = { 'id_rsa_key': self.id_rsa_path, - 'backup_file_path':self.backup_file_path, - 'backup_file_name':self.backup_file_name, + 'backup_file':os.path.join(self.backup_file_path, + self.backup_file_name), + 'backup_server':self.backup_server } cmd = ['scp', '-l', '40000', '-i', '%(id_rsa_key)s' % params, - '%(backup_file_path)s/%(backup_file_name)s' % params, - 'root@192.168.2.102:/backups/mercurial' % params] + '%(backup_file)s' % params, + '%(backup_server)s' % params] subprocess.call(cmd) logging.info('Transfered file %s to %s', self.backup_file_name, cmd[4]) @@ -106,7 +94,12 @@ if __name__ == "__main__": - B_MANAGER = BackupManager('/home/pylons/id_rsa', 'repositories.config') + + repo_location = '/home/repo_path' + backup_server = 'root@192.168.1.100:/backups/mercurial' + rsa_key = '/home/id_rsa' + + B_MANAGER = BackupManager(repo_location, rsa_key, backup_server) B_MANAGER.backup_repos() B_MANAGER.transfer_files() B_MANAGER.rm_file()