added critical session around backupSettings func
authorBarthaM@N3SIM1218.D03.arc.local
Thu, 02 Oct 2014 18:29:40 +0100
changeset 2358fd7b197735c
parent 234 216da9017f8f
child 236 8bfcfd4dd6ad
added critical session around backupSettings func
OpenSecurity/bin/vmmanager.pyw
     1.1 --- a/OpenSecurity/bin/vmmanager.pyw	Thu Oct 02 13:08:09 2014 +0100
     1.2 +++ b/OpenSecurity/bin/vmmanager.pyw	Thu Oct 02 18:29:40 2014 +0100
     1.3 @@ -61,6 +61,7 @@
     1.4  
     1.5  
     1.6  new_sdvm_lock = threading.Lock()
     1.7 +backup_lock = threading.Lock()
     1.8  
     1.9  class VMManagerException(Exception):
    1.10      def __init__(self, value):
    1.11 @@ -1051,9 +1052,11 @@
    1.12          self.vmm.sdvmFactory.trigger()
    1.13  
    1.14      def backupFile(self, src, dest):
    1.15 -        certificate = Cygwin.cygPath(self.vmm.getMachineFolder()) + '/' + self.vm_name + '/dvm_key'
    1.16 -        command = '-r -o StrictHostKeyChecking=no -i "' + certificate + '" "osecuser@' + self.ip_addr + ':' + src + '" "' + dest + '"'
    1.17 -        return Cygwin.execute(Cygwin.cygwin_scp, command, wait_return=True, window=False)
    1.18 +        global backup_lock
    1.19 +        with backup_lock:
    1.20 +            certificate = Cygwin.cygPath(self.vmm.getMachineFolder()) + '/' + self.vm_name + '/dvm_key'
    1.21 +            command = '-r -o StrictHostKeyChecking=no -i "' + certificate + '" "osecuser@' + self.ip_addr + ':' + src + '" "' + dest + '"'
    1.22 +            return Cygwin.execute(Cygwin.cygwin_scp, command, wait_return=True, window=False)
    1.23      
    1.24      def restoreFile(self, src, dest):
    1.25          certificate = Cygwin.cygPath(self.vmm.getMachineFolder()) + '/' + self.vm_name + '/dvm_key'