alfraser commited on
Commit
30696ca
·
1 Parent(s): dd89a23

Fixed bug where the Logger was logging its own name and not that of the architecture.

Browse files
Files changed (1) hide show
  1. src/architectures.py +6 -6
src/architectures.py CHANGED
@@ -204,7 +204,7 @@ class LogWorker(Thread):
204
 
205
  def run(self):
206
  while True:
207
- request, trace, trace_tags, trace_comment = LogWorker.queue.get()
208
  if request is None:
209
  LogWorker.commit_repo()
210
  else:
@@ -213,7 +213,7 @@ class LogWorker(Thread):
213
  LogWorker.commit_timer = None
214
  try:
215
  save_dict = {
216
- 'architecture': self.name,
217
  'request': request.as_dict(),
218
  'trace': trace.as_dict(),
219
  'test_tags': trace_tags,
@@ -256,14 +256,14 @@ class LogWorker(Thread):
256
  @classmethod
257
  def signal_commit(cls):
258
  print("LogWorker signalling commit based on time elapsed")
259
- cls.queue.put((None, None, None, None))
260
 
261
  @classmethod
262
- def write(cls, request: ArchitectureRequest, trace: ArchitectureTrace,
263
  trace_tags: List[str] = None, trace_comment: str = None):
264
  trace_tags = [] if trace_tags is None else trace_tags
265
  trace_comment = "" if trace_comment is None else trace_comment
266
- cls.queue.put((request, trace, trace_tags, trace_comment))
267
 
268
 
269
  # Instantiate and run worker on import
@@ -403,7 +403,7 @@ class Architecture:
403
  trace.steps[-1].exception = err
404
  traceback.print_exc()
405
  break
406
- LogWorker.write(request, trace, trace_tags, trace_comment)
407
  return trace
408
 
409
 
 
204
 
205
  def run(self):
206
  while True:
207
+ arch_name, request, trace, trace_tags, trace_comment = LogWorker.queue.get()
208
  if request is None:
209
  LogWorker.commit_repo()
210
  else:
 
213
  LogWorker.commit_timer = None
214
  try:
215
  save_dict = {
216
+ 'architecture': arch_name,
217
  'request': request.as_dict(),
218
  'trace': trace.as_dict(),
219
  'test_tags': trace_tags,
 
256
  @classmethod
257
  def signal_commit(cls):
258
  print("LogWorker signalling commit based on time elapsed")
259
+ cls.queue.put((None, None, None, None, None))
260
 
261
  @classmethod
262
+ def write(cls, arch_name: str, request: ArchitectureRequest, trace: ArchitectureTrace,
263
  trace_tags: List[str] = None, trace_comment: str = None):
264
  trace_tags = [] if trace_tags is None else trace_tags
265
  trace_comment = "" if trace_comment is None else trace_comment
266
+ cls.queue.put((arch_name, request, trace, trace_tags, trace_comment))
267
 
268
 
269
  # Instantiate and run worker on import
 
403
  trace.steps[-1].exception = err
404
  traceback.print_exc()
405
  break
406
+ LogWorker.write(self.name, request, trace, trace_tags, trace_comment)
407
  return trace
408
 
409