Changeset 35981

Timestamp:

Aug 20, 2013, 3:30:10 PM (13 years ago)

Author:

watersc1

Message:

I think this is clean.

File:

• trunk/ippm/FilesMonitoring/NodeRelated/refresh_table.py (modified) (2 diffs)

trunk/ippm/FilesMonitoring/NodeRelated/refresh_table.py

@@ -19 +19 @@
     loggingLevel = logging.INFO # 
     skip_stages = []
-    updatedb_binary = '/home/panstarrs/schastel/local/bin/updatedb'
-    locate_binary = '/home/panstarrs/schastel/local/bin/locate'
-    mlocate_db_template = '/export/%s.%s/schastel/mlocate/%s.%s.%s.mlocate_db'
+# Place we find all the installed IPP stuff
+    bin_directory = "%s/%s/bin" % (os.environ['PSCONFDIR'], os.environ['PSCONFIG'])
+    share_directory = "%s/%s/share/filemon/" % (os.environ['PSCONFDIR'], os.environ['PSCONFIG'])
+
+# Templates for things we'll either create or read
+    node_directory = '/export/%s.%s/ipp_filemon/'
+    mlocate_db_template = "%s/%s", (node_directory,'mlocate/%s.%s.%s.mlocate_db')
     lock_directory = '/tmp/diskMonitoring/%s' # disk
     lock_filename_template = '%s/lock.%s'
     nebulous_directory_template = '/export/%s.%s/nebulous/%s'
-    update_table_undefined_python_script = '/home/panstarrs/schastel/dev/FilesMonitoring/NodeRelated/update_table_undefined.py'
-    update_table_python_script = '/home/panstarrs/schastel/dev/FilesMonitoring/NodeRelated/update_table.py'
+
+# Locations of the binaries we'll run
+    updatedb_binary = '%s/updatedb' % bin_directory
+    locate_binary = '%s/locate' % bin_directory
+    update_table_undefined_python_script = "%s/update_table_undefined.py" % bin_directory
+    update_table_python_script = '%s/update_table.py' % bin_directory
+
     disk = "0" # Most of the nodes have only one disk /export/<node name>.0
     next_directory = None
@@ -516 +525 @@
     formatter = logging.Formatter('%(asctime)s | %(levelname)7s | %(message)s', 
                                   '%Y-%m-%dT%H:%M:%S')
-    log_directory = '/data/%s.0/schastel/logs' % (nodename)
+#    log_directory = '/data/%s.0/schastel/logs' % (nodename)
+    log_directory = ("%s/logs" % (node_directory)) % (nodename, disk)
     log_filename = '%s/%s_refresh.log' % (log_directory, nodename)
     try: