Skip to contentSkip to conversation

event: add bb.event.ParseError

PATCH Superseded [email protected] 4 participants 5 messages Apr 10, 2023 – Apr 12, 2023

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 event: add bb.event.ParseError

From: Mingli Yu <[email protected]>

Add bb.event.ParseError to let error-report can catch this kind of error.

---
 lib/bb/cooker.py | 6 ++++--
 lib/bb/event.py  | 8 ++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)
lib/bb/cooker.py +4 -2
index 1797a1d4..206f8ffb 100644
@@ -2223,7 +2223,7 @@ class CookerParser(object):
 
             self.results = itertools.chain(self.results, self.parse_generator())
 
-    def shutdown(self, clean=True):
+    def shutdown(self, clean=True, eventmsg=""):
         if not self.toparse:
             return
         if self.haveshutdown:
@@ -2238,6 +2238,8 @@ class CookerParser(object):
 
             bb.event.fire(event, self.cfgdata)
         else:
+            if eventmsg:
+                bb.event.fire(bb.event.ParseError(eventmsg), self.cfgdata)
             bb.error("Parsing halted due to errors, see error messages above")
 
         # Cleanup the queue before call process.join(), otherwise there might be
@@ -2355,7 +2357,7 @@ class CookerParser(object):
         except bb.parse.ParseError as exc:
             self.error += 1
             logger.error(str(exc))
-            self.shutdown(clean=False)
+            self.shutdown(clean=False, eventmsg=str(exc))
             return False
         except bb.data_smart.ExpansionError as exc:
             self.error += 1
lib/bb/event.py +8 -0
index 37cc630c..72393829 100644
@@ -856,3 +856,11 @@ class FindSigInfoResult(Event):
     def __init__(self, result):
         Event.__init__(self)
         self.result = result
+
+class ParseError(Event):
+    """
+    Event to indicate parse failed
+    """
+    def __init__(self, msg):
+        Event.__init__(self)
+        self._msg = msg
Signature · 1 line
2.25.1
#1 lore raw
Quoted 61 lines · Mingli

From: Mingli Yu <[email protected]>

Add bb.event.ParseError to let error-report can catch this kind of error.

---
 lib/bb/cooker.py | 6 ++++--
 lib/bb/event.py  | 8 ++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)
lib/bb/cooker.py +1 -1
index 1797a1d4..206f8ffb 100644
@@ -2223,7 +2223,7 @@ class CookerParser(object):
 
             self.results = itertools.chain(self.results,
 self.parse_generator())
 
-    def shutdown(self, clean=True):
+    def shutdown(self, clean=True, eventmsg=""):
         if not self.toparse:
             return

if self.haveshutdown:

lib/bb/cooker.py +2 -0
@@ -2238,6 +2238,8 @@ class CookerParser(object):
 
             bb.event.fire(event, self.cfgdata)
         else:
+            if eventmsg:
+                bb.event.fire(bb.event.ParseError(eventmsg), self.cfgdata)
             bb.error("Parsing halted due to errors, see error messages
 above")
 

# Cleanup the queue before call process.join(), otherwise there
might be

lib/bb/cooker.py +1 -1
@@ -2355,7 +2357,7 @@ class CookerParser(object):
         except bb.parse.ParseError as exc:
             self.error += 1
             logger.error(str(exc))
-            self.shutdown(clean=False)
+            self.shutdown(clean=False, eventmsg=str(exc))
             return False
         except bb.data_smart.ExpansionError as exc:
             self.error += 1
lib/bb/event.py +8 -1
index 37cc630c..72393829 100644
@@ -856,3 +856,11 @@ class FindSigInfoResult(Event):
     def __init__(self, result):
         Event.__init__(self)
         self.result = result
+
+class ParseError(Event):
+    """
+    Event to indicate parse failed
+    """
+    def __init__(self, msg):
+        Event.__init__(self)
+        self._msg = msg
--
Quoted 3 lines

2.25.1

Can't we just use super ?
super().__init__() instead of Event.__init__(self)
I didn't find a reference but I think it is a more pythonic way of calling parent class.

#2 lore raw
In reply to [email protected]
Quoted 24 lines · Mingli

From: Mingli Yu <[email protected]>

Add bb.event.ParseError to let error-report can catch this kind of error.

---
 lib/bb/cooker.py | 6 ++++--
 lib/bb/event.py  | 8 ++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)
lib/bb/cooker.py +1 -1
index 1797a1d4..206f8ffb 100644
@@ -2223,7 +2223,7 @@ class CookerParser(object):
 
             self.results = itertools.chain(self.results, self.parse_generator())
 
-    def shutdown(self, clean=True):
+    def shutdown(self, clean=True, eventmsg=""):
         if not self.toparse:
             return
         if self.haveshutdown:

lib/bb/cooker.py class CookerParser(object): · line 2243

Quoted 6 lines
lib/bb/cooker.py +2 -0
@@ -2238,6 +2238,8 @@ class CookerParser(object):
 
             bb.event.fire(event, self.cfgdata)
         else:
+            if eventmsg:
+                bb.event.fire(bb.event.ParseError(eventmsg), self.cfgdata)
             bb.error("Parsing halted due to errors, see error messages above")

Shouldn't this always fire the event even if there is no specific error message?

Cheers,

Richard

#3 lore raw

Hi Richard,

Quoted 29 lines · Richard Purdie

CAUTION: This email comes from a non Wind River email account!
Do not click links or open attachments unless you recognize the sender and know the content is safe.

Quoted 25 lines · Mingli

From: Mingli Yu <[email protected]>

Add bb.event.ParseError to let error-report can catch this kind of error.

---
  lib/bb/cooker.py | 6 ++++--
  lib/bb/event.py  | 8 ++++++++
  2 files changed, 12 insertions(+), 2 deletions(-)
lib/bb/cooker.py +1 -1
index 1797a1d4..206f8ffb 100644
@@ -2223,7 +2223,7 @@ class CookerParser(object):
 
              self.results = itertools.chain(self.results, self.parse_generator())
 
-    def shutdown(self, clean=True):
+    def shutdown(self, clean=True, eventmsg=""):
          if not self.toparse:
              return
          if self.haveshutdown:
@@ -2238,6 +2238,8 @@ class CookerParser(object):
 
Quoted 8 lines

lib/bb/cooker.py class CookerParser(object): · line 2243

Quoted 5 lines
lib/bb/cooker.py +2 -0
              bb.event.fire(event, self.cfgdata)
          else:
+            if eventmsg:
+                bb.event.fire(bb.event.ParseError(eventmsg), self.cfgdata)
              bb.error("Parsing halted due to errors, see error messages above")

Shouldn't this always fire the event even if there is no specific error message?

There are many kinds of exception here and each exception will call shudown function, but we only catch bb.parse.ParseError exception and pass eventmsg to shudown function when it is bb.parse.ParseError. So checking eventmsg in shutdown function should be okay.

except bb.parse.ParseError as exc:

            self.error += 1
            logger.error(str(exc))
            self.shutdown(clean=False, eventmsg=str(exc))
            return False

Thanks,

Quoted 5 lines

Cheers,

Richard

#4 lore raw
Quoted 46 lines · Mingli

Hi Richard,

Quoted 29 lines · Richard Purdie

CAUTION: This email comes from a non Wind River email account!
Do not click links or open attachments unless you recognize the sender and know the content is safe.

Quoted 25 lines · Mingli

From: Mingli Yu <[email protected]>

Add bb.event.ParseError to let error-report can catch this kind of error.

---
  lib/bb/cooker.py | 6 ++++--
  lib/bb/event.py  | 8 ++++++++
  2 files changed, 12 insertions(+), 2 deletions(-)
lib/bb/cooker.py +1 -1
index 1797a1d4..206f8ffb 100644
@@ -2223,7 +2223,7 @@ class CookerParser(object):
 
              self.results = itertools.chain(self.results, self.parse_generator())
 
-    def shutdown(self, clean=True):
+    def shutdown(self, clean=True, eventmsg=""):
          if not self.toparse:
              return
          if self.haveshutdown:
@@ -2238,6 +2238,8 @@ class CookerParser(object):
 
Quoted 8 lines

lib/bb/cooker.py class CookerParser(object): · line 2243

Quoted 5 lines
lib/bb/cooker.py +2 -0
              bb.event.fire(event, self.cfgdata)
          else:
+            if eventmsg:
+                bb.event.fire(bb.event.ParseError(eventmsg), self.cfgdata)
              bb.error("Parsing halted due to errors, see error messages above")

Shouldn't this always fire the event even if there is no specific error message?

There are many kinds of exception here and each exception will call shudown function, but we only catch bb.parse.ParseError exception and pass eventmsg to shudown function when it is bb.parse.ParseError. So checking eventmsg in shutdown function should be okay.

Quoted 5 lines

except bb.parse.ParseError as exc:

             self.error += 1
             logger.error(str(exc))
             self.shutdown(clean=False, eventmsg=str(exc))
             return False

I don't mean to call it totally unconditionally, only in the same cases as we show the bb.error()

Cheers,

Richard