Re-add daemonize support to the server

Fix some pylint errors
Add better error handling for function calls
Add mesh-mode support for sshbase


git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1612 ce84e21b-d406-0410-9b95-82705330c041

1 files changed, 1 insertions, 6 deletions

diff --git a/src/lib/Server/Plugins/TCheetah.py b/src/lib/Server/Plugins/TCheetah.py
index f39ebbad0..1ebdb6c94 100644
--- a/src/lib/Server/Plugins/TCheetah.py
+++ b/src/lib/Server/Plugins/TCheetah.py
@@ -60,11 +60,6 @@ class TCheetah(Plugin):
         '''Dispatch fetch calls to the correct object'''
         self.entries[entry.get('name')].BuildFile(entry, metadata)
 
-    def MapName(self, name):
-        '''MapName finds the object corresponding to a particular file
-        the DirShadow MapName method maps filenames literally'''
-        return name        
-
     def HandleEvent(self, event):
         '''Unified FAM event handler for DirShadow'''
         #print "got event %s %s %s" % ( event.code2str(), event.filename, event.requestID)
@@ -72,7 +67,7 @@ class TCheetah(Plugin):
         if event.filename[0] == '/':
             return
         epath = "".join([self.data, self.handles[event.requestID], event.filename])
-        identifier = self.MapName(epath[len(self.data):])
+        identifier = epath[len(self.data):]
         if action in ['exists', 'created']:
             if isdir(epath):
                 self.AddDirectoryMonitor(epath[len(self.data):])