STRLCPY/geneva

Merge pull request #45 from lepz0r/master
```
Add ability to set log file's log level
```
Kevin Bock committed with GitHub 2 years ago

57e19c2d

2 parents
40dcb7c8
8a5a49e2

■ ■ ■ ■ ■ ■

actions/utils.py

		skipped 106 lines
107	107
108	108
109	109
110		-	def get_logger(basepath, log_dir, logger_name, log_name, environment_id, log_level="DEBUG", demo_mode=False):
	110	+	def get_logger(basepath, log_dir, logger_name, log_name, environment_id, log_level="DEBUG", file_log_level="DEBUG", demo_mode=False):
111	111		"""
112	112		Configures and returns a logger.
113	113		"""
114	114		if type(log_level) == str:
115	115		log_level = log_level.upper()
	116	+	if type(file_log_level) == str:
	117	+	file_log_level = file_log_level.upper()
116	118		global CONSOLE_LOG_LEVEL
117	119		full_path = os.path.join(basepath, log_dir, "logs")
118	120		if not os.path.exists(full_path):
		skipped 11 lines
130	132		if logger.handlers:
131	133		return logger
132	134		fh = logging.FileHandler(os.path.join(basepath, log_dir, "logs", "%s.%s.log" % (environment_id, log_name)))
133		-	fh.setLevel("DEBUG")
134	135
135	136		log_prefix = "[%s] " % log_name.upper()
136	137		formatter = logging.Formatter("%(asctime)s %(levelname)s:" + log_prefix + "%(message)s", datefmt="%Y-%m-%d %H:%M:%S")
		skipped 4 lines
141	142		ch = logging.StreamHandler()
142	143		ch.setFormatter(formatter)
143	144		ch.setLevel(log_level)
	145	+	fh.setLevel(file_log_level)
144	146		CONSOLE_LOG_LEVEL = log_level.lower()
145	147		logger.addHandler(ch)
146	148		return CustomAdapter(logger, {}) if demo_mode else logger
		skipped 379 lines

■ ■ ■ ■ ■ ■

engine.py

		skipped 38 lines
39	39		server_side=False,
40	40		output_directory="trials",
41	41		log_level="info",
	42	+	file_log_level="info",
42	43		enabled=True,
43	44		in_queue_num=None,
44	45		out_queue_num=None,
		skipped 44 lines
89	90		"engine",
90	91		self.environment_id,
91	92		log_level=log_level,
	93	+	file_log_level=file_log_level,
92	94		demo_mode=demo_mode)
93	95		# Warn if these are not provided
94	96		if not environment_id:
		skipped 336 lines
431	433		parser.add_argument('--server-side', action='store_true', help='Enable if this is running on the server side')
432	434		parser.add_argument('--log', action='store', default="debug",
433	435		choices=("debug", "info", "warning", "critical", "error"),
434		-	help="Sets the log level")
	436	+	help="Sets the log level for the console")
	437	+	parser.add_argument('--file-log', action='store', default="debug",
	438	+	choices=("debug", "info", "warning", "critical", "error"),
	439	+	help="Sets the log level for the log file")
435	440		parser.add_argument('--no-save-packets', action='store_false', help='Disables recording captured packets')
436	441		parser.add_argument("--in-queue-num", action="store", help="NfQueue number for incoming packets", default=1, type=int)
437	442		parser.add_argument("--out-queue-num", action="store", help="NfQueue number for outgoing packets", default=None, type=int)
		skipped 20 lines
458	463		output_directory=args["output_directory"],
459	464		forwarder=nat_config,
460	465		log_level=args["log"],
	466	+	file_log_level=args["file_log"],
461	467		in_queue_num=args["in_queue_num"],
462	468		out_queue_num=args["out_queue_num"],
463	469		save_seen_packets=args["no_save_packets"],
		skipped 8 lines

Merge pull request #45 from lepz0r/master