[Erp5-report] r33877 luke - in /erp5/trunk/utils/erp5.timmy: setup.py src/erp5/timmy/timmy.py

[nobody at svn.erp5.org]

Author: luke
Date: Thu Mar 18 15:48:04 2010
New Revision: 33877

URL: http://svn.erp5.org?rev=33877&view=rev
Log:
 - add a script to generate key

Modified:
    erp5/trunk/utils/erp5.timmy/setup.py
    erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py

Modified: erp5/trunk/utils/erp5.timmy/setup.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.timmy/setup.py?rev=33877&r1=33876&r2=33877&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.timmy/setup.py [utf8] (original)
+++ erp5/trunk/utils/erp5.timmy/setup.py [utf8] Thu Mar 18 15:48:04 2010
@@ -34,5 +34,6 @@
     entry_points = """
     [console_scripts]
     timmy = erp5.timmy.timmy:run
+    timmy-keygen = erp5.timmy.timmy:keygen
     """,
     )

Modified: erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py?rev=33877&r1=33876&r2=33877&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py [utf8] (original)
+++ erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py [utf8] Thu Mar 18 15:48:04 2010
@@ -323,7 +323,30 @@
       server.call('updatePartitionState', partition.partition_id,
         *result)
 
+def keygenParseOptions():
+  parser = OptionParser()
+  parser.add_option("-k", "--key-file",
+    help="File with server key")
+  (options, args) = parser.parse_args()
+  required_option_list = [
+      'key_file',
+    ]
+  for o in required_option_list:
+    if not getattr(options, o, None):
+      parser.error('All options are required, missing "%s".' % o)
+  return options, args
+
+def keygen():
+  (options, args) = keygenParseOptions()
+  key = getServerKey(options.key_file)
+  print 'Server key located at: %s' % os.path.abspath(options.key_file)
+  print 'Key: %s' % key
+
 def run():
+  # example invocation:
+  # bin/timmy -k key.key -s http://server:port/portal_grids/tiolive \
+  #  -b timmy-base.cfg -t timmy-templates/ \
+  #  -o timmy-controller.cfg -d timmy-instances -r bin/buildout
   logging.basicConfig(level=logging.INFO)
   (options, args) = parseOptions()
   server = XMLRPCServer(options.server_url, getServerKey(options.key_file))
@@ -361,8 +384,4 @@
   subprocess.call([SUPERVISORCTL, 'update'])
 
 if __name__ == '__main__':
-  # example invocation:
-  # bin/timmy -k key.key -s http://server:port/portal_grids/tiolive \
-  #  -b timmy-base.cfg -t timmy-templates/ \
-  #  -o timmy-controller.cfg -d timmy-instances -r bin/buildout
   run()