X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nm.py;h=3f8edbc5d97b29f8ef6b26a05fd5b7ae2b2a5fdf;hb=2377994fe75797399d3cd686432b586f6347b4d8;hp=b4b0d6baa1ff746a7d368d939acb109b7f57f911;hpb=caa7e7414b08f12391b761ce293bf9163cfca589;p=nodemanager.git

diff --git a/nm.py b/nm.py
index b4b0d6b..3f8edbc 100755
--- a/nm.py
+++ b/nm.py
@@ -31,12 +31,7 @@ savedargv = sys.argv[:]
 # NOTE: modules listed here should also be loaded in this order
 known_modules=['net','conf_files', 'sm', 'bwmon']
 
-# Deal with plugins directory
 plugin_path = "/usr/share/NodeManager/plugins"
-if os.path.exists(plugin_path):
-    sys.path.append(plugin_path)
-    known_modules += [i[:-3] for i in os.listdir(plugin_path) if i.endswith(".py") and (i[:-3] not in known_modules)]
-
 
 parser = optparse.OptionParser()
 parser.add_option('-d', '--daemon', action='store_true', dest='daemon', default=False, help='run daemonized')
@@ -91,7 +86,7 @@ def getPLCDefaults(data, config):
                 logger.verbose("Found default slice overrides.\n %s" % attr_dict)
                 config.OVERRIDES = attr_dict
             return 
-    if 'OVERRIDES' in dir(config): del config.OVERRIDES
+    if 'OVERRIDES' not in dir(config): del config.OVERRIDES
 
 
 def run():
@@ -151,13 +146,6 @@ def run():
 
 if __name__ == '__main__':
     logger.log("Entering nm.py "+id)
-    stacklim = 512*1024  # 0.5 MiB
-    curlim = resource.getrlimit(resource.RLIMIT_STACK)[0]  # soft limit
-    if curlim > stacklim:
-        resource.setrlimit(resource.RLIMIT_STACK, (stacklim, stacklim))
-        # for some reason, doesn't take effect properly without the exec()
-        python = '/usr/bin/python'
-        os.execv(python, [python] + savedargv)
     run()
 else:
     # This is for debugging purposes.  Open a copy of Python and import nm