Index: /trunk/ippm/FilesMonitoring/NodeRelated/update_table_undefined.py =================================================================== --- /trunk/ippm/FilesMonitoring/NodeRelated/update_table_undefined.py (revision 35983) +++ /trunk/ippm/FilesMonitoring/NodeRelated/update_table_undefined.py (revision 35984) @@ -10,5 +10,5 @@ from ipp.lifetime_templates import Template except ImportError: - sys.path.append('/home/panstarrs/schastel/local/share/python/') + sys.path.append('%s/%s/share/python/' % os.environ['PSCONFDIR'], os.environ['PSCONFIG']) sys.stderr.write('ImportError') for folder in sys.path: Index: /trunk/ippm/FilesMonitoring/Supervision/cluster_status.py =================================================================== --- /trunk/ippm/FilesMonitoring/Supervision/cluster_status.py (revision 35983) +++ /trunk/ippm/FilesMonitoring/Supervision/cluster_status.py (revision 35984) @@ -9,4 +9,7 @@ toGigs = 1024.**3 toGigsFromK = 1024.**2 + +bin_directory = "%s/%s/bin" % (os.environ['PSCONFDIR'], os.environ['PSCONFIG']) +share_directory = "%s/%s/share/filemon/" % (os.environ['PSCONFDIR'], os.environ['PSCONFIG']) def usage(): @@ -47,5 +50,5 @@ sql_check = True elif argv[1] == 'mhpcc': - nodesFilename = '/home/panstarrs/schastel/local/share/ippMhpccStorageNodes' + nodesFilename = '%s/ippMhpccStorageNodes' % share_directory nodesFile = open(nodesFilename) nodes = [] @@ -86,7 +89,17 @@ "stsci07.0", "stsci07.1", "stsci07.2", "stsci08.0", "stsci08.1", "stsci08.2", - "stsci09.0", "stsci09.1", "stsci09.2", ] + "stsci09.0", "stsci09.1", "stsci09.2", + "stsci10.0", "stsci10.1", "stsci10.2", + "stsci11.0", "stsci11.1", "stsci11.2", + "stsci12.0", "stsci12.1", "stsci12.2", + "stsci13.0", "stsci13.1", "stsci13.2", + "stsci14.0", "stsci14.1", "stsci14.2", + "stsci15.0", "stsci15.1", "stsci15.2", + "stsci16.0", "stsci16.1", "stsci16.2", + "stsci17.0", "stsci17.1", "stsci17.2", + "stsci18.0", "stsci18.1", "stsci18.2", + "stsci19.0", "stsci19.1", "stsci19.2", ] elif argv[1] == 'all': - nodesFilename = '/home/panstarrs/schastel/local/share/ippMhpccStorageNodes' + nodesFilename = '%s/ippMhpccStorageNodes' % share_directory nodesFile = open(nodesFilename) nodes = [] @@ -106,5 +119,15 @@ "stsci07.0", "stsci07.1", "stsci07.2", "stsci08.0", "stsci08.1", "stsci08.2", - "stsci09.0", "stsci09.1", "stsci09.2", ]) + "stsci09.0", "stsci09.1", "stsci09.2", + "stsci10.0", "stsci10.1", "stsci10.2", + "stsci11.0", "stsci11.1", "stsci11.2", + "stsci12.0", "stsci12.1", "stsci12.2", + "stsci13.0", "stsci13.1", "stsci13.2", + "stsci14.0", "stsci14.1", "stsci14.2", + "stsci15.0", "stsci15.1", "stsci15.2", + "stsci16.0", "stsci16.1", "stsci16.2", + "stsci17.0", "stsci17.1", "stsci17.2", + "stsci18.0", "stsci18.1", "stsci18.2", + "stsci19.0", "stsci19.1", "stsci19.2", ] else: nodes = [ ] @@ -138,5 +161,5 @@ def is_update_running(node): - p = subprocess.Popen( ['/home/panstarrs/schastel/dev/FilesMonitoring/Supervision/node_status.py', node], + p = subprocess.Popen( ['%s/node_status.py' % bin_directory, node], stderr = subprocess.PIPE, stdout = subprocess.PIPE) Index: /trunk/ippm/FilesMonitoring/Supervision/node_status.py =================================================================== --- /trunk/ippm/FilesMonitoring/Supervision/node_status.py (revision 35983) +++ /trunk/ippm/FilesMonitoring/Supervision/node_status.py (revision 35984) @@ -10,4 +10,8 @@ import datetime +bin_directory = "%s/%s/bin" % (os.environ['PSCONFDIR'], os.environ['PSCONFIG']) +share_directory = "%s/%s/share/filemon/" % (os.environ['PSCONFDIR'], os.environ['PSCONFIG']) +node_directory = '/export/%s/ipp_filemon/' + def process_arguments(argv): if len(argv) == 1: @@ -15,5 +19,5 @@ sys.exit(1) elif argv[1] == 'all': - nodesFilename = '/home/panstarrs/schastel/local/share/ippMhpccStorageNodes' + nodesFilename = '%s/ippMhpccStorageNodes' % share_directory nodesFile = open(nodesFilename) nodes = [] @@ -45,5 +49,5 @@ def get_seconds_since_last_message(ssh, node): - logfilename = '/export/%s/schastel/logs/%s_refresh.log' % (node, node) + logfilename = ('%s/%s' % (node_directory, '/logs/%s_refresh.log') % (node, node)) stdin, stdout, stderr = ssh.exec_command('tail -n 1 %s' % (logfilename)) for line in stdout: Index: /trunk/ippm/FilesMonitoring/generate_tables.py =================================================================== --- /trunk/ippm/FilesMonitoring/generate_tables.py (revision 35983) +++ /trunk/ippm/FilesMonitoring/generate_tables.py (revision 35984) @@ -2,7 +2,8 @@ letters = '0123456789abcdef' +share_directory = "%s/%s/share/filemon/" % (os.environ['PSCONFDIR'], os.environ['PSCONFIG']) nodes = [] -nodesFile = open('/home/panstarrs/schastel/local/share/ippMhpccStorageNodes') +nodesFile = open('%s/ippMhpccStorageNodes' % share_directory) for line in nodesFile: nodes.append(line[:-1]) @@ -10,5 +11,5 @@ template = "" -templateFile = open('sql/CreateTablesTemplate.sql') +templateFile = open('%s/sql/CreateTablesTemplate.sql' % share_directory) for line in templateFile: template = "%s%s" % (template, line) Index: /trunk/ippm/FilesMonitoring/populate_table.py =================================================================== --- /trunk/ippm/FilesMonitoring/populate_table.py (revision 35983) +++ /trunk/ippm/FilesMonitoring/populate_table.py (revision 35984) @@ -5,18 +5,23 @@ import os +bin_directory = "%s/%s/bin" % (os.environ['PSCONFDIR'], os.environ['PSCONFIG']) +share_directory = "%s/%s/share/filemon/" % (os.environ['PSCONFDIR'], os.environ['PSCONFIG']) +node_directory = '/export/%s.0/ipp_filemon/' + def populate(node, directory): + root_dir = "%s/populate" % node_directory try: - os.makedirs('/export/%s.0/schastel/populate/sql' % node) + os.makedirs(('%s/sql' % root_dir) % node) except OSError: pass - output = open('/export/%s.0/schastel/populate/sql/populate_%s_%s.sql' % (node, node, directory), + output = open(('%s/%s' % (root_dir, 'sql/populate_%s_%s.sql')) % (node, node, directory), 'w') - ignored = open('/export/%s.0/schastel/populate/ignored_%s_%s' % (node, node, directory), + ignored = open(('%s/%s' % (root_dir, 'log/ignored_%s_%s')) % (node, node, directory), 'w') - stdout = open('/export/%s.0/schastel/populate/stdout_%s_%s' % (node, node, directory), + stdout = open(('%s/%s' % (root_dir, 'log/stdout_%s_%s')) % (node, node, directory), 'w') - index_filename = '/export/%s.0/schastel/mlocate/%s.%s.mlocate_db' % (node, node, directory) - p = subprocess.Popen(('/home/panstarrs/schastel/local/bin/locate -d %s .' - % index_filename).split(' '), + index_filename = ('%s/%s' % (node_directory,'/mlocate/%s.%s.mlocate_db')) % (node, node, directory) + p = subprocess.Popen(('%s/locate -d %s .' + % bin_directory,index_filename).split(' '), stdout = subprocess.PIPE) p.poll() @@ -41,5 +46,5 @@ letters = '0123456789abcdef' insertTemplate="" -sqlFile = open('/home/panstarrs/schastel/dev/FilesMonitoring/sql/insert_template.sql') +sqlFile = open('%s/sql/insert_template.sql' % share_directory) for line in sqlFile: insertTemplate = "%s%s" % (insertTemplate, line) Index: /trunk/ippm/FilesMonitoring/tools/deneb-locate.py =================================================================== --- /trunk/ippm/FilesMonitoring/tools/deneb-locate.py (revision 35983) +++ /trunk/ippm/FilesMonitoring/tools/deneb-locate.py (revision 35984) @@ -72,4 +72,14 @@ ("stsci08", "0"), ("stsci08", "1"), ("stsci08", "2"), ("stsci09", "0"), ("stsci09", "1"), ("stsci09", "2"), + ("stsci10", "0"), ("stsci10", "1"), ("stsci10", "2"), + ("stsci11", "0"), ("stsci11", "1"), ("stsci11", "2"), + ("stsci12", "0"), ("stsci12", "1"), ("stsci12", "2"), + ("stsci13", "0"), ("stsci13", "1"), ("stsci13", "2"), + ("stsci14", "0"), ("stsci14", "1"), ("stsci14", "2"), + ("stsci15", "0"), ("stsci15", "1"), ("stsci15", "2"), + ("stsci16", "0"), ("stsci16", "1"), ("stsci16", "2"), + ("stsci17", "0"), ("stsci17", "1"), ("stsci17", "2"), + ("stsci18", "0"), ("stsci18", "1"), ("stsci18", "2"), + ("stsci19", "0"), ("stsci19", "1"), ("stsci19", "2"), ]