zenoss-commit Mailing List for Zenoss Community Edition (Page 12)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Author: jstevens
Date: 2008-04-29 15:02:35 -0400 (Tue, 29 Apr 2008)
New Revision: 9137

Modified:
   trunk/Products/ZenUtils/ZenBackup.py
   trunk/Products/ZenUtils/ZenBackupBase.py
   trunk/Products/ZenUtils/ZenRestore.py
Log:
refs #3071


Modified: trunk/Products/ZenUtils/ZenBackup.py
===================================================================

--- trunk/Products/ZenUtils/ZenBackup.py	2008-04-29 17:44:47 UTC (rev 9136)
+++ trunk/Products/ZenUtils/ZenBackup.py	2008-04-29 19:02:35 UTC (rev 9137)
@@ -22,6 +22,7 @@
 from ZCmdBase import ZCmdBase
 import sys
 import os
+import os.path
 from datetime import date
 import ConfigParser
 import commands
@@ -39,7 +40,10 @@
     def isZeoUp(self):
         ''' Returns True is zeo appears to be running, false otherwise.
         '''
-        cmd = '%s/bin/zeoup.py -p 8100' % self.zenhome
+        # zeoup.py should live in either $ZOPEHOME/lib/bin/ (for the
+        # appliance) or in $ZENHOME/bin (other installs.)
+        zeoup = self.findBin('zeoup.py')
+        cmd = '%s %s -p 8100' % (zenPath('bin', 'python'), zeoup)
         output = commands.getoutput(cmd)
         return output.startswith('Elapsed time:')
 
@@ -75,7 +79,7 @@
         def getName(index=0):
             return 'zenbackup_%s%s.tgz' % (date.today().strftime('%Y%m%d'), 
                                             (index and '_%s' % index) or '')
-        backupDir = os.path.join(self.zenhome, 'backups')
+        backupDir = zenPath('backups')
         if not os.path.exists(backupDir):
             os.mkdir(backupDir, 0750)
         for i in range(MAX_UNIQUE_NAME_ATTEMPTS):
@@ -203,16 +207,16 @@
         self.msg('Backing up zeo database.')
         repozoDir = os.path.join(tempDir, 'repozo')
         os.mkdir(repozoDir, 0750)
-        cmd = ('%s --backup --full ' % 
-                self.getRepozoPath() +
-                '--repository %s --file %s/var/Data.fs' %
-                (repozoDir, self.zenhome))
+        cmd = ('%s %s --backup --full ' % 
+                (zenPath('bin', 'python'), self.findBin('repozo.py')) +
+                '--repository %s --file %s' %
+                (repozoDir, zenPath('var', 'Data.fs')))
         if os.system(cmd): return -1
         
         # /etc to backup dir (except for sockets)
         self.msg('Backing up config files.')
         etcTar = tarfile.open(os.path.join(tempDir, 'etc.tar'), 'w')
-        etcTar.add(os.path.join(self.zenhome, 'etc'), 'etc')
+        etcTar.add(zenPath('etc'), 'etc')
         etcTar.close()
 
         # /perf to backup dir

Modified: trunk/Products/ZenUtils/ZenBackupBase.py
===================================================================
--- trunk/Products/ZenUtils/ZenBackupBase.py	2008-04-29 17:44:47 UTC (rev 9136)
+++ trunk/Products/ZenUtils/ZenBackupBase.py	2008-04-29 19:02:35 UTC (rev 9137)
@@ -21,6 +21,7 @@
 import os
 import tempfile
 from CmdBase import CmdBase
+from Products.ZenUtils.Utils import zenPath
 
 
 BACKUP_DIR = 'zenbackup'
@@ -39,11 +40,7 @@
 
     def __init__(self, noopts=0):
         CmdBase.__init__(self, noopts)
-        from Utils import zenPath
-        self.zenhome = zenPath()
-        self.zopehome = os.getenv('ZOPEHOME')
 
-
     def msg(self, msg):
         ''' If --verbose then send msg to stdout
         '''
@@ -71,7 +68,7 @@
         '''
         if self.options.dbpass == None:
             return ''
-        return '-p"%s"' % self.options.dbpass
+        return '--password="%s"' % self.options.dbpass
 
 
     def getTempDir(self):
@@ -83,14 +80,21 @@
         else:
             dir = tempfile.mkdtemp()
         return dir
-        
-        
-    def getRepozoPath(self):
-        ''' Return path to repozo.py
-        This is usually $ZENHOME/bin/repozo.py, but on the appliance it is
-        $ZOPEHOME/bin/repozo.py
-        '''
-        path = os.path.join(self.zenhome, 'bin', 'repozo.py')
-        if not os.path.isfile(path):
-            path = os.path.join(self.zopehome, 'bin', 'repozo.py')
-        return path
+
+
+    def findBin(self, name, failIfNotFound=True):
+        """
+        Find the file of the given name in either $ZENHOME/bin or in
+        $ZOPEHOME/bin.  Return the path to the file if found.
+        """
+        zopeHome = os.getenv('ZOPEHOME')
+        path = zenPath('bin', name)
+        if os.path.isfile(path):
+            return path
+        if zopeHome:
+            path = os.path.join(zopeHome, 'bin', name)
+            if os.path.isfile(path):
+                return path
+        if failIfNotFound:
+            raise Exception('Could not find %s' % name)
+        return ''

Modified: trunk/Products/ZenUtils/ZenRestore.py
===================================================================
--- trunk/Products/ZenUtils/ZenRestore.py	2008-04-29 17:44:47 UTC (rev 9136)
+++ trunk/Products/ZenUtils/ZenRestore.py	2008-04-29 19:02:35 UTC (rev 9137)
@@ -23,6 +23,7 @@
 import os
 import os.path
 import ConfigParser
+from Products.ZenUtils.Utils import zenPath
 
 from ZenBackupBase import *
 
@@ -147,38 +148,39 @@
         # If there is not a Data.fs then create an empty one
         # Maybe should read file location/name from zeo.conf
         # but we're going to assume the standard location for now.
-        if not os.path.isfile(os.path.join(self.zenhome, 'var', 'Data.fs')):
+        if not os.path.isfile(zenPath('var', 'Data.fs')):
             self.msg('There does not appear to be a zeo database.'
                         ' Starting zeo to create one.')
-            os.system(os.path.join(self.zenhome, 'bin', 'zeoctl start > /dev/null'))
-            os.system(os.path.join(self.zenhome, 'bin', 'zeoctl stop > /dev/null'))
+            os.system(zenPath('bin', 'zeoctl') + 'start > /dev/null')
+            os.system(zenPath('bin', 'zeoctl') + 'stop > /dev/null')
         
         # Restore zopedb
         self.msg('Restoring the zeo database.')
         repozoDir = os.path.join(tempDir, 'repozo')
-        cmd ='%s --recover --repository %s --output %s' % (
-                    self.getRepozoPath(),
+        cmd ='%s %s --recover --repository %s --output %s' % (
+                    zenPath('bin', 'python'),
+                    self.findBin('repozo.py'),
                     repozoDir,
-                    os.path.join(self.zenhome, 'var', 'Data.fs'))
+                    zenPath('var', 'Data.fs'))
         if os.system(cmd): return -1
     
         # Copy etc files
         self.msg('Restoring config files.')
-        cmd = 'rm -rf %s' % os.path.join(self.zenhome, 'etc')
+        cmd = 'rm -rf %s' % zenPath('etc')
         if os.system(cmd): return -1
         cmd = 'tar Cxf %s %s' % (
-                        self.zenhome,
+                        zenPath(),
                         os.path.join(tempDir, 'etc.tar'))
         if os.system(cmd): return -1
         
         # Copy perf files
-        cmd = 'rm -rf %s' % os.path.join(self.zenhome, 'perf')
+        cmd = 'rm -rf %s' % os.path.join(zenPath(), 'perf')
         if os.system(cmd): return -1
         tempPerf = os.path.join(tempDir, 'perf.tar')
         if os.path.isfile(tempPerf):
             self.msg('Restoring performance data.')
             cmd = 'tar Cxf %s %s' % (
-                            self.zenhome,
+                            zenPath(),
                             os.path.join(tempDir, 'perf.tar'))
             if os.system(cmd): return -1
         else:





2007	Jan	Feb (65)	Mar (276)	Apr (544)	May (638)	Jun (225)	Jul (204)	Aug (294)	Sep (532)	Oct (506)	Nov (324)	Dec (359)
2008	Jan (208)	Feb (225)	Mar (248)	Apr (388)	May (222)	Jun (47)	Jul	Aug	Sep	Oct	Nov	Dec

zenoss-commit Mailing List for Zenoss Community Edition (Page 12)

Zenoss - Intelligent IT Operations Management

zenoss-commit — svn commit list