Skip to content

Commit f1d4953

Browse files
emmuhammemmuhamm
committed
[TO REVERT] storing
1 parent 6a60f1e commit f1d4953

2 files changed

Lines changed: 87 additions & 83 deletions

File tree

‎src/daqpytools/apps/logging_demonstrator.py‎

Lines changed: 86 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
LogHandlerConf,
1111
dummy_add_erstrace_handler,
1212
ThrottleFilter,
13-
ERSHandlerConf,
1413
StreamType,
1514
)
1615
from daqpytools.logging.levels import logging_log_level_keys
@@ -152,112 +151,117 @@ def main(
152151
ers_kafka_handler=ersprotobufstream,
153152
throttle=throttle
154153
)
155-
main_logger.debug("example debug message")
156-
main_logger.info("example info message")
157-
main_logger.warning("example warning message")
158-
main_logger.error("example error message")
159-
main_logger.critical("example critical message")
160-
main_logger.info(
161-
"[dim cyan]You[/dim cyan] "
162-
"[bold green]can[/bold green] "
163-
"[bold yellow]also[/bold yellow] "
164-
"[bold red]add[/bold red] "
165-
"[bold white on red]colours[/bold white on red] "
166-
"[bold red]to[/bold red] "
167-
"[bold yellow]your[/bold yellow] "
168-
"[bold green]log[/bold green] "
169-
"[dim cyan]record[/dim cyan] "
170-
"[bold green]text[/bold green] "
171-
"[bold yellow]with[/bold yellow] "
172-
"[bold green]markdown[/bold green]!"
173-
)
174-
main_logger.warning(
175-
"Note: [red] the daqpytools.logging.formatter removes markdown-style "
176-
"comments from the log record message [/red]."
177-
)
154+
# main_logger.debug("example debug message")
155+
# main_logger.info("example info message")
156+
# main_logger.warning("example warning message")
157+
# main_logger.error("example error message")
158+
# main_logger.critical("example critical message")
159+
# main_logger.info(
160+
# "[dim cyan]You[/dim cyan] "
161+
# "[bold green]can[/bold green] "
162+
# "[bold yellow]also[/bold yellow] "
163+
# "[bold red]add[/bold red] "
164+
# "[bold white on red]colours[/bold white on red] "
165+
# "[bold red]to[/bold red] "
166+
# "[bold yellow]your[/bold yellow] "
167+
# "[bold green]log[/bold green] "
168+
# "[dim cyan]record[/dim cyan] "
169+
# "[bold green]text[/bold green] "
170+
# "[bold yellow]with[/bold yellow] "
171+
# "[bold green]markdown[/bold green]!"
172+
# )
173+
# main_logger.warning(
174+
# "Note: [red] the daqpytools.logging.formatter removes markdown-style "
175+
# "comments from the log record message [/red]."
176+
# )
178177

179-
if child_logger:
180-
nested_logger: logging.Logger = get_daq_logger(
181-
logger_name=f"{logger_name}.child",
182-
log_level=log_level,
183-
use_parent_handlers=not disable_logger_inheritance,
184-
rich_handler=rich_handler,
185-
file_handler_path=file_handler_path,
186-
stream_handlers=stream_handlers,
187-
)
188-
nested_logger.debug("example debug message")
189-
nested_logger.info("example info message")
190-
nested_logger.warning("example warning message")
191-
nested_logger.error("example error message")
192-
nested_logger.critical("example critical message")
193-
nested_logger.info(
194-
"[dim cyan]You[/dim cyan] "
195-
"[bold green]can[/bold green] "
196-
"[bold yellow]also[/bold yellow] "
197-
"[bold red]add[/bold red] "
198-
"[bold white on red]colours[/bold white on red] "
199-
"[bold red]to[/bold red] "
200-
"[bold yellow]your[/bold yellow] "
201-
"[bold green]log[/bold green] "
202-
"[dim cyan]record[/dim cyan] "
203-
"[bold green]text[/bold green] "
204-
"[bold yellow]with[/bold yellow] "
205-
"[bold green]markdown[/bold green]!"
206-
)
207-
nested_logger.warning(
208-
"Note: [red] the daqpytools.logging.formatter removes markdown-style "
209-
"comments from the log record message [/red]."
210-
)
178+
# if child_logger:
179+
# nested_logger: logging.Logger = get_daq_logger(
180+
# logger_name=f"{logger_name}.child",
181+
# log_level=log_level,
182+
# use_parent_handlers=not disable_logger_inheritance,
183+
# rich_handler=rich_handler,
184+
# file_handler_path=file_handler_path,
185+
# stream_handlers=stream_handlers,
186+
# )
187+
# nested_logger.debug("example debug message")
188+
# nested_logger.info("example info message")
189+
# nested_logger.warning("example warning message")
190+
# nested_logger.error("example error message")
191+
# nested_logger.critical("example critical message")
192+
# nested_logger.info(
193+
# "[dim cyan]You[/dim cyan] "
194+
# "[bold green]can[/bold green] "
195+
# "[bold yellow]also[/bold yellow] "
196+
# "[bold red]add[/bold red] "
197+
# "[bold white on red]colours[/bold white on red] "
198+
# "[bold red]to[/bold red] "
199+
# "[bold yellow]your[/bold yellow] "
200+
# "[bold green]log[/bold green] "
201+
# "[dim cyan]record[/dim cyan] "
202+
# "[bold green]text[/bold green] "
203+
# "[bold yellow]with[/bold yellow] "
204+
# "[bold green]markdown[/bold green]!"
205+
# )
206+
# nested_logger.warning(
207+
# "Note: [red] the daqpytools.logging.formatter removes markdown-style "
208+
# "comments from the log record message [/red]."
209+
# )
211210

212211

213212
# Throttle demo
214213

215-
def emit_err(i):
216-
main_logger.info(f"Throttle test {i}", extra={"handlers": [HandlerType.Rich, HandlerType.Throttle]})
214+
# def emit_err(i):
215+
# main_logger.info(f"Throttle test {i}", extra={"handlers": [HandlerType.Rich, HandlerType.Throttle]})
217216

218-
if throttle:
219-
for i in range(50):
220-
emit_err(i)
221-
main_logger.warning("Sleeping for 30 seconds")
222-
time.sleep(31) #demonstrate 30s time window
223-
for i in range(100):
224-
emit_err(i)
217+
# if throttle:
218+
# for i in range(500000):
219+
# emit_err(i)
220+
# main_logger.warning("Sleeping for 30 seconds")
221+
# time.sleep(31) #demonstrate 30s time window
222+
# for i in range(100):
223+
# emit_err(i)
225224

226225

227226

228-
# HandlerTypes demo
229-
if not handlertypes:
230-
return
227+
# # HandlerTypes demo
228+
# if not handlertypes:
229+
# return
231230

232-
#* Add all dummy handlers which have not been developed yet
233-
dummy_add_ERSTrace_handler(main_logger, True)
231+
# #* Add all dummy handlers which have not been developed yet
232+
# dummy_add_ERSTrace_handler(main_logger, True)
234233

235234

236235
#* Test choosing which handler to use individually
237-
main_logger.debug("Default go to tty / rich / file when added")
238-
main_logger.critical("Should only go to tty", extra={"handlers": [HandlerType.Rich]})
239-
main_logger.critical("Should only go to file", extra={"handlers": [HandlerType.File]})
240-
main_logger.critical("Should only go to Lstdout", extra={"handlers": [HandlerType.Lstdout]})
241-
main_logger.critical("Should only go to ERSTrace", extra={"handlers": [HandlerType.ERSTrace]})
242-
main_logger.critical("Should only go to Throttle", extra={"handlers": [HandlerType.Throttle]})
243-
main_logger.critical("Should go to tty and Protobufstream", extra={"handlers": [HandlerType.Rich, HandlerType.Protobufstream]})
244236

245237

246-
#* Interlude: Inject sample environment variables
238+
# main_logger.debug("Default goes to both")
239+
# main_logger.critical("Should only go to tty", extra={"handlers": [HandlerType.Rich]})
240+
# main_logger.critical("Should only go to file", extra={"handlers": [HandlerType.File]})
241+
242+
243+
244+
# main_logger.critical("Should only go to Lstdout", extra={"handlers": [HandlerType.Lstdout]})
245+
# main_logger.critical("Should only go to ERSTrace", extra={"handlers": [HandlerType.ERSTrace]})
246+
# main_logger.critical("Should only go to Throttle", extra={"handlers": [HandlerType.Throttle]})
247+
# main_logger.critical("Should go to tty and Protobufstream", extra={"handlers": [HandlerType.Rich, HandlerType.Protobufstream]})
248+
249+
250+
# #* Interlude: Inject sample environment variables
247251
os.environ["DUNEDAQ_ERS_WARNING"] = "erstrace,throttle,lstdout"
248252
os.environ["DUNEDAQ_ERS_INFO"] = "erstrace,throttle,lstdout"
249253
os.environ["DUNEDAQ_ERS_FATAL"] = "erstrace,lstdout"
250254
os.environ["DUNEDAQ_ERS_ERROR"] = "erstrace,throttle,lstdout,protobufstream(monkafka.cern.ch:30092)"
251255

252-
main_logger.info(f"{os.getenv('DUNEDAQ_ERS_ERROR')=}")
253-
main_logger.info(f"{os.getenv('DUNEDAQ_ERS_CRITICAL')=}")
256+
# main_logger.info(f"{os.getenv('DUNEDAQ_ERS_ERROR')=}")
257+
# main_logger.info(f"{os.getenv('DUNEDAQ_ERS_CRITICAL')=}")
254258

255-
#* Test the routing to the Base and Opmon streams
259+
# #* Test the routing to the Base and Opmon streams
256260
handlerconf = LogHandlerConf()
257261
main_logger.warning("Handlerconf Base", extra=handlerconf.Base)
258262
main_logger.warning("Handlerconf Opmon", extra=handlerconf.Opmon)
259263

260-
#* Test ERS Streams
264+
# #* Test ERS Streams
261265
main_logger.warning("ERS Warning erstrace,throttle,lstdout", extra=handlerconf.ERS)
262266
main_logger.info("ERS Info erstrace,throttle,lstdout", extra=handlerconf.ERS)
263267
main_logger.critical("ERS Fatal erstrace,lstdout", extra=handlerconf.ERS)

‎src/daqpytools/logging/handlers.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ class ThrottleFilter(BaseHandlerFilter):
268268
... logger.error("Repeated error message")
269269
"""
270270

271-
def __init__(self, initial_threshold: int = 30, time_limit: int = 30):
271+
def __init__(self, initial_threshold: int = 10, time_limit: int = 30):
272272
super().__init__()
273273
self.initial_threshold = initial_threshold
274274
self.time_limit = time_limit

0 commit comments

Comments
 (0)