mirror of https://github.com/Kkevsterrr/geneva
Merge pull request #35 from VwCSXg/close-filedescriptors
Close files of engine logger
This commit is contained in:
commit
3c1c963c93
24
engine.py
24
engine.py
|
@ -132,9 +132,11 @@ class Engine():
|
||||||
|
|
||||||
def __exit__(self, exc_type, exc_value, tb):
|
def __exit__(self, exc_type, exc_value, tb):
|
||||||
"""
|
"""
|
||||||
Allows the engine to be used as a context manager; simply stops the engine
|
Allows the engine to be used as a context manager
|
||||||
if enabled.
|
Stops the engine if enabled and closes loggers.
|
||||||
"""
|
"""
|
||||||
|
for handler in self.logger.handlers:
|
||||||
|
handler.close()
|
||||||
if self.enabled:
|
if self.enabled:
|
||||||
self.shutdown_nfqueue()
|
self.shutdown_nfqueue()
|
||||||
|
|
||||||
|
@ -443,14 +445,13 @@ def main(args):
|
||||||
"""
|
"""
|
||||||
Kicks off the engine with the given arguments.
|
Kicks off the engine with the given arguments.
|
||||||
"""
|
"""
|
||||||
try:
|
|
||||||
nat_config = {}
|
nat_config = {}
|
||||||
if args.get("sender_ip") and args.get("routing_ip") and args.get("forward_ip"):
|
if args.get("sender_ip") and args.get("routing_ip") and args.get("forward_ip"):
|
||||||
nat_config = {"sender_ip" : args["sender_ip"],
|
nat_config = {"sender_ip": args["sender_ip"],
|
||||||
"routing_ip" : args["routing_ip"],
|
"routing_ip": args["routing_ip"],
|
||||||
"forward_ip" : args["forward_ip"]}
|
"forward_ip": args["forward_ip"]}
|
||||||
|
|
||||||
eng = Engine(args["server_port"],
|
with Engine(args["server_port"],
|
||||||
args["strategy"],
|
args["strategy"],
|
||||||
environment_id=args["environment_id"],
|
environment_id=args["environment_id"],
|
||||||
server_side=args["server_side"],
|
server_side=args["server_side"],
|
||||||
|
@ -460,12 +461,9 @@ def main(args):
|
||||||
in_queue_num=args["in_queue_num"],
|
in_queue_num=args["in_queue_num"],
|
||||||
out_queue_num=args["out_queue_num"],
|
out_queue_num=args["out_queue_num"],
|
||||||
save_seen_packets=args["no_save_packets"],
|
save_seen_packets=args["no_save_packets"],
|
||||||
demo_mode=args["demo_mode"])
|
demo_mode=args["demo_mode"]):
|
||||||
eng.initialize_nfqueue()
|
|
||||||
while True:
|
threading.Event().wait() # Wait forever
|
||||||
time.sleep(0.5)
|
|
||||||
finally:
|
|
||||||
eng.shutdown_nfqueue()
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
|
Loading…
Reference in New Issue