From: Barış Metin <Talip-Baris.Metin@sophia.inria.fr>
Date: Mon, 30 Nov 2009 23:29:30 +0000 (+0000)
Subject: - remove __all__ from util/__init__.py, no module uses from import *
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=2d41e72a7e3a45323f36ee8357faef33c907abc1;hp=19526abfa68450168107cfa13251a8027c014fad;p=monitor.git

- remove __all__ from util/__init__.py, no module uses from import *
- fix import path for tools/getsshkeys.py
- add reboot.py to commands. it just uses monitor/reboot.py
---

diff --git a/commands/reboot.py b/commands/reboot.py
new file mode 100644
index 0000000..8b373d2
--- /dev/null
+++ b/commands/reboot.py
@@ -0,0 +1,35 @@
+from monitor.reboot import *
+
+def main():
+	logger.setLevel(logging.DEBUG)
+	ch = logging.StreamHandler()
+	ch.setLevel(logging.DEBUG)
+	formatter = logging.Formatter('LOGGER - %(message)s')
+	ch.setFormatter(formatter)
+	logger.addHandler(ch)
+
+	try:
+		if "test" in sys.argv:
+			dryrun = True
+		else:
+			dryrun = False
+
+		for node in sys.argv[1:]:
+			if node == "test": continue
+
+			print "Rebooting %s" % node
+			if reboot_policy(node, True, dryrun):
+				print "success"
+			else:
+				print "failed"
+	except Exception, err:
+		import traceback; traceback.print_exc()
+		from monitor.common import email_exception
+		email_exception(node)
+		print err
+
+if __name__ == '__main__':
+	main()
+	f = open("/tmp/rebootlog", 'a')
+	f.write("reboot %s\n" % sys.argv)
+	f.close()
diff --git a/monitor/bootman.py b/monitor/bootman.py
index 1dd22cd..eac2761 100755
--- a/monitor/bootman.py
+++ b/monitor/bootman.py
@@ -826,4 +826,4 @@ def restore_basic(sitehist, hostname, config=None, forced_action=None):
 	
 
 if __name__ == "__main__":
-	print "ERROR: Can not execute module as a command! Please use commands/%s." % __file__
+	print "ERROR: Can not execute module as a command! Please use commands/%s.py" % os.path.splitext(__file__)[0]
diff --git a/monitor/reboot.py b/monitor/reboot.py
index 15d5c52..cd49a59 100755
--- a/monitor/reboot.py
+++ b/monitor/reboot.py
@@ -108,37 +108,6 @@ def reboot_policy(nodename, continue_probe, dryrun):
 		print "return true"
 		return True
 
-def main():
-	logger.setLevel(logging.DEBUG)
-	ch = logging.StreamHandler()
-	ch.setLevel(logging.DEBUG)
-	formatter = logging.Formatter('LOGGER - %(message)s')
-	ch.setFormatter(formatter)
-	logger.addHandler(ch)
+if __name__ == "__main__":
+	print "ERROR: Can not execute module as a command! Please use commands/%s.py" % os.path.splitext(__file__)[0]
 
-	try:
-		if "test" in sys.argv:
-			dryrun = True
-		else:
-			dryrun = False
-
-		for node in sys.argv[1:]:
-			if node == "test": continue
-
-			print "Rebooting %s" % node
-			if reboot_policy(node, True, dryrun):
-				print "success"
-			else:
-				print "failed"
-	except Exception, err:
-		import traceback; traceback.print_exc()
-		from monitor.common import email_exception
-		email_exception(node)
-		print err
-
-if __name__ == '__main__':
-	logger = logging.getLogger("monitor")
-	main()
-	f = open("/tmp/rebootlog", 'a')
-	f.write("reboot %s\n" % sys.argv)
-	f.close()
diff --git a/monitor/util/__init__.py b/monitor/util/__init__.py
index 98802a3..c5a3dfd 100644
--- a/monitor/util/__init__.py
+++ b/monitor/util/__init__.py
@@ -1,4 +1,3 @@
-__all__=["writepid","removepid","daemonize"]
 
 import time
 import math
diff --git a/tools/getsshkeys.py b/tools/getsshkeys.py
index ed90652..0104deb 100755
--- a/tools/getsshkeys.py
+++ b/tools/getsshkeys.py
@@ -1,7 +1,10 @@
 #!/usr/bin/python
 
 import sys
-from monitor.util.sshknownhosts import SSHKnownHosts
+sys.path.append('.')
+sys.path.append('..')
+
+from monitor.util.file import *
 
 def main(hosts):
 	k = SSHKnownHosts()