diff --git a/hp-tipping-point/tpToIdea.py b/hp-tipping-point/tpToIdea.py index 3e1f6de8878cf108094c2258bf4d580f1efc62a7..1d723790f1ce7fcbc3db5ea0461d75ea5b7fb034 100644 --- a/hp-tipping-point/tpToIdea.py +++ b/hp-tipping-point/tpToIdea.py @@ -403,52 +403,49 @@ def reload_me(signum, frame): def main(): global running_flag global reload_flag - logging.basicConfig(format='%(levelname)s:%(message)s', level=logging.DEBUG, filename='tipping_point_daemon_log.log', filemode='w') + logging.basicConfig(format='%(levelname)s:%(message)s', level=logging.DEBUG, filename='tipping_point_log.log', filemode='w') optp = get_args() opts, args = optp.parse_args() if not args or opts.name is None or opts.dir is None: optp.print_help() sys.exit() - try: - if opts.oneshot: - signal.signal(signal.SIGINT, terminate_me) - signal.signal(signal.SIGTERM, terminate_me) - files = [open(arg) for arg in args] - else: - daemonize( - pidfile=opts.pid, - uid=opts.uid, - gid=opts.gid, - signals={ - signal.SIGINT: terminate_me, - signal.SIGTERM: terminate_me, - signal.SIGHUP: reload_me - }) - files = [FileWatcher(arg) for arg in args] - filer = Filer(opts.dir) - idea_gen = IdeaGen(opts.name, opts.test) - while running_flag: - for log_file in files: - while True: - line = log_file.readline() - if line is None or not line.strip(): - logging.info("no line") - break - logging.info("readline") - process_data(line, filer, opts.origdata, idea_gen) - if not running_flag: + if opts.oneshot: + signal.signal(signal.SIGINT, terminate_me) + signal.signal(signal.SIGTERM, terminate_me) + files = [open(arg) for arg in args] + else: + daemonize( + pidfile=opts.pid, + uid=opts.uid, + gid=opts.gid, + signals={ + signal.SIGINT: terminate_me, + signal.SIGTERM: terminate_me, + signal.SIGHUP: reload_me + }) + files = [FileWatcher(arg) for arg in args] + filer = Filer(opts.dir) + idea_gen = IdeaGen(opts.name, opts.test) + while running_flag: + for log_file in files: + while True: + line = log_file.readline() + if line is None or not line.strip(): + logging.info("no line") break - if reload_flag: - for f in files: - f.close() - f.open() - reload_flag = False - if opts.oneshot: + logging.info("readline") + process_data(line, filer, opts.origdata, idea_gen) + if not running_flag: break - else: - time.sleep(opts.poll) - except Exception as e: - logging.exception(e) + if reload_flag: + for f in files: + f.close() + f.open() + reload_flag = False + if opts.oneshot: + break + else: + time.sleep(opts.poll) if __name__ == "__main__":