Author: tmckay Date: 2011-03-03 16:56:42 +0000 (Thu, 03 Mar 2011) New Revision: 4572
Modified: trunk/cumin/bin/cumin-data trunk/cumin/bin/cumin-web trunk/parsley/python/parsley/loggingex.py trunk/wooly/python/wooly/server.py Log: Corrections for Python 2.4 try-except-finally construct does not exist in 2.4 import needed for "sleep" under 2.4 thread.is_alive is thread.isAlive is 2.4
Modified: trunk/cumin/bin/cumin-data =================================================================== --- trunk/cumin/bin/cumin-data 2011-03-03 16:26:02 UTC (rev 4571) +++ trunk/cumin/bin/cumin-data 2011-03-03 16:56:42 UTC (rev 4572) @@ -49,75 +49,76 @@ pipeThread = None
try: - mint = None - return_code = 0 - setup_initial_logging() + try: + mint = None + return_code = 0 + setup_initial_logging()
- config, values, opts, args = get_configuration(CuminDataOptionParser(), CuminDataConfig) + config, values, opts, args = get_configuration(CuminDataOptionParser(), CuminDataConfig)
- setup_operational_logging(opts) + setup_operational_logging(opts)
- model_dir = os.path.join(config.home, "model") + model_dir = os.path.join(config.home, "model")
- broker_uris = [x.strip() for x in opts.brokers.split(",")] + broker_uris = [x.strip() for x in opts.brokers.split(",")]
- mint = Mint(model_dir, broker_uris, opts.database) + mint = Mint(model_dir, broker_uris, opts.database)
- mint.print_event_level = opts.print_events + mint.print_event_level = opts.print_events
- mint.expire_thread.interval = values.expire_interval - mint.expire_thread.threshold = values.expire_threshold + mint.expire_thread.interval = values.expire_interval + mint.expire_thread.threshold = values.expire_threshold
- mint.vacuum_thread.interval = values.vacuum_interval + mint.vacuum_thread.interval = values.vacuum_interval
- mint.check() - mint.init() + mint.check() + mint.init()
- if values.packages: - packages = list() + if values.packages: + packages = list()
- for name in values.packages.split(","): - name = name.strip() + for name in values.packages.split(","): + name = name.strip()
- try: - pkg = mint.model._packages_by_name[name] - except KeyError: - print "No package found for '%s'" % name + try: + pkg = mint.model._packages_by_name[name] + except KeyError: + print "No package found for '%s'" % name
- packages.append(pkg) + packages.append(pkg)
- mint.session.qmf_packages = packages + mint.session.qmf_packages = packages
- if opts.init_only: - return + if opts.init_only: + return
- mint.start() + mint.start()
- stats = mint.update_thread.stats - count = 0 + stats = mint.update_thread.stats + count = 0
- if opts.print_stats: - print "[Starred columns are the number of events per second]" + if opts.print_stats: + print "[Starred columns are the number of events per second]"
- while True: - if count % 20 == 0: - stats.print_headings() + while True: + if count % 20 == 0: + stats.print_headings()
- count += 1 + count += 1
- stats.print_values() + stats.print_values()
- sleep(5) - else: - while True: - sleep(86400) + sleep(5) + else: + while True: + sleep(86400)
- except (KeyboardInterrupt, SystemExit): - pass + except (KeyboardInterrupt, SystemExit): + pass
- except: - print_exc() - return_code = 1 + except: + print_exc() + return_code = 1
finally: if mint:
Modified: trunk/cumin/bin/cumin-web =================================================================== --- trunk/cumin/bin/cumin-web 2011-03-03 16:26:02 UTC (rev 4571) +++ trunk/cumin/bin/cumin-web 2011-03-03 16:56:42 UTC (rev 4572) @@ -48,53 +48,54 @@ pipeThread = None
try: - return_code = 0 - cumin = None + try: + return_code = 0 + cumin = None
- setup_initial_logging() + setup_initial_logging()
- config, values, opts, args = get_configuration(CuminWebOptionParser(), CuminWebConfig) + config, values, opts, args = get_configuration(CuminWebOptionParser(), CuminWebConfig)
- setup_operational_logging(opts) + setup_operational_logging(opts)
- broker_uris = [x.strip() for x in opts.brokers.split(",")] + broker_uris = [x.strip() for x in opts.brokers.split(",")]
- cumin = Cumin(config.get_home(), broker_uris, opts.database, - opts.host, opts.port) + cumin = Cumin(config.get_home(), broker_uris, opts.database, + opts.host, opts.port)
- cumin.debug = opts.debug - cumin.user = values.user - cumin.update_interval = values.update_interval - cumin.max_qmf_table_sort = values.max_qmf_table_sort + cumin.debug = opts.debug + cumin.user = values.user + cumin.update_interval = values.update_interval + cumin.max_qmf_table_sort = values.max_qmf_table_sort
- # set default values for form inputs - cumin.set_form_defaults(values.request_memory, - values.request_memory_vm, - values.request_disk, - values.request_disk_vm) + # set default values for form inputs + cumin.set_form_defaults(values.request_memory, + values.request_memory_vm, + values.request_disk, + values.request_disk_vm)
- cumin.check() - cumin.init() + cumin.check() + cumin.init()
- if opts.init_only: - return + if opts.init_only: + return
- cumin.start() + cumin.start()
- while True: - # print_threads() - sleep(1) - if not cumin.server_alive(): - print "web server has stopped, exiting..." - return_code = 1 - break + while True: + # print_threads() + sleep(1) + if not cumin.server_alive(): + print "web server has stopped, exiting..." + return_code = 1 + break
- except (KeyboardInterrupt, SystemExit): - pass + except (KeyboardInterrupt, SystemExit): + pass
- except: - print_exc() - return_code = 1 + except: + print_exc() + return_code = 1
finally: if cumin:
Modified: trunk/parsley/python/parsley/loggingex.py =================================================================== --- trunk/parsley/python/parsley/loggingex.py 2011-03-03 16:26:02 UTC (rev 4571) +++ trunk/parsley/python/parsley/loggingex.py 2011-03-03 16:56:42 UTC (rev 4572) @@ -1,12 +1,13 @@ import logging import os + import traceback import select from logging.handlers import RotatingFileHandler from collectionsex import defaultdict from threading import Thread +from time import sleep
- _levels_by_name = { "debug": logging.DEBUG, "info": logging.INFO, @@ -143,23 +144,24 @@ # which could leave IO broken. stop = False try: - while not stop: - r, w, e = select.select(self.descriptors+[self.stop_r], [], []) - for desc in r: - if desc == self.stop_r: - stop = True - else: - msg = os.read(desc,1024) - if msg != "": - if self.rollover_size != 0: - self.check_rollover(self.files[desc]) - self.files[desc][0].write(msg) - self.files[desc][0].flush() + try: + while not stop: + r, w, e = select.select(self.descriptors+[self.stop_r], [], []) + for desc in r: + if desc == self.stop_r: + stop = True + else: + msg = os.read(desc,1024) + if msg != "": + if self.rollover_size != 0: + self.check_rollover(self.files[desc]) + self.files[desc][0].write(msg) + self.files[desc][0].flush()
- except Exception, e: - if callable(self.call_on_fail): - self.call_on_fail() - traceback.print_exc() + except Exception, e: + if callable(self.call_on_fail): + self.call_on_fail() + traceback.print_exc()
finally: for key, value in self.files.items():
Modified: trunk/wooly/python/wooly/server.py =================================================================== --- trunk/wooly/python/wooly/server.py 2011-03-03 16:26:02 UTC (rev 4571) +++ trunk/wooly/python/wooly/server.py 2011-03-03 16:56:42 UTC (rev 4572) @@ -24,7 +24,7 @@ self.client_session_expire_thread = ClientSessionExpireThread(self)
def server_alive(self): - return self.dispatch_thread.is_alive() + return self.dispatch_thread.isAlive()
def init(self): return # XXX urgh