Merge with bd3f341cad457c5106bb16170ffac5c894f8e841

hg_app_daemon

@@ -1,60 +1,61 b''
 #!/sbin/runscript
 ########################################
 #### THIS IS AN GENTOO INIT.D SCRIPT####
 ########################################
 
 APP_NAME="hg_app"
 APP_HOMEDIR="marcink/python_workspace"
 APP_PATH="/home/$APP_HOMEDIR/$APP_NAME"
 
 CONF_NAME="production.ini"
 
 PID_PATH="$APP_PATH/$APP_NAME.pid"
 LOG_PATH="$APP_PATH/$APP_NAME.log"
 
 PYTHON_PATH="/home/$APP_HOMEDIR/v-env"
 
 RUN_AS="marcink"
 
 DAEMON="$PYTHON_PATH/bin/paster"
 
 DAEMON_OPTS="serve --daemon \
 --user=$RUN_AS \
 --group=$RUN_AS \
 --pid-file=$PID_PATH \
 --log-file=$LOG_PATH  $APP_PATH/$CONF_NAME"
 
 #extra options
 opts="${opts} restartdelay"
 
 depend() {
     need nginx
 }
 
 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
     eend $?
 }
 
 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
     fi
     eend $?
 }
 
 restartdelay() {
     #stop()
     echo "sleep3"
     sleep 3
     
     #start()
 }

hg_app_daemon2

@@ -1,72 +1,77 b''
 #!/bin/sh -e
 ########################################
 #### THIS IS AN DEBIAN INIT.D SCRIPT####
 ########################################
 
 ### BEGIN INIT INFO
 # Provides:          hg-app          
 # Required-Start:    $all
 # Required-Stop:     $all
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: starts instance of hg-app
 # Description:       starts instance of hg-app using start-stop-daemon
 ### END INIT INFO
 
 APP_NAME="hg_app"
 APP_HOMEDIR="marcink/python_workspace"
 APP_PATH="/home/$APP_HOMEDIR/$APP_NAME"
 
 CONF_NAME="production.ini"
 
 PID_PATH="$APP_PATH/$APP_NAME.pid"
 LOG_PATH="$APP_PATH/$APP_NAME.log"
 
 PYTHON_PATH="/home/$APP_HOMEDIR/v-env"
 
 RUN_AS="marcink"
 
 DAEMON="$PYTHON_PATH/bin/paster"
 
 DAEMON_OPTS="serve --daemon \
 --user=$RUN_AS \
 --group=$RUN_AS \
 --pid-file=$PID_PATH \
 --log-file=$LOG_PATH  $APP_PATH/$CONF_NAME"
 
 
 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
     fi
     ;;
   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}"
     exit 1
 esac
  No newline at end of file

pylons_app/lib/backup_manager.py

@@ -1,114 +1,107 b''
 #!/usr/bin/env python
 # encoding: utf-8
 # mercurial repository backup manager
 # Copyright (C) 2009-2010 Marcin Kuzminski <[e-mail]>
  
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
 # 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 
 """
 Created on Feb 28, 2010
 Mercurial repositories backup manager
 @author: marcink
 """
 
 
 import logging
-from mercurial import config
 import tarfile
 import os
 import datetime
 import sys
 import subprocess
 logging.basicConfig(level=logging.DEBUG,
                     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")
 
         for dir_name in os.listdir(self.repos_path):
             logging.info('backing up %s', dir_name)
             tar.add(os.path.join(self.repos_path, dir_name), dir_name)
         tar.close()
         logging.info('finished backup of mercurial repositories')
 
 
 
     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])
         
     
     def rm_file(self):
         logging.info('Removing file %s', self.backup_file_name)
         os.remove(os.path.join(self.backup_file_path, self.backup_file_name))
     
 
 
 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()